rename SSLType => TLSType
for consistency with TLSVersions. the variable names are unchanged to avoid churn.
This commit is contained in:
parent
a7f1b86475
commit
faec30abf4
2
NEWS
2
NEWS
|
@ -13,7 +13,7 @@ Renamed the ReNew/--renew/-N options to Upgrade/--upgrade/-u
|
||||||
and Delete/--delete/-d to Gone/--gone/-g.
|
and Delete/--delete/-d to Gone/--gone/-g.
|
||||||
|
|
||||||
Superseded SSLVersions option with TLSVersions, and disabled TLS v1.0
|
Superseded SSLVersions option with TLSVersions, and disabled TLS v1.0
|
||||||
and v1.1 by default.
|
and v1.1 by default. Renamed SSLType option to TLSType.
|
||||||
|
|
||||||
Made the Channel side to expire with MaxMessages configurable.
|
Made the Channel side to expire with MaxMessages configurable.
|
||||||
|
|
||||||
|
|
|
@ -3786,7 +3786,15 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep )
|
||||||
}
|
}
|
||||||
} else if (!strcasecmp( "CipherString", cfg->cmd )) {
|
} else if (!strcasecmp( "CipherString", cfg->cmd )) {
|
||||||
server->sconf.cipher_string = nfstrdup( cfg->val );
|
server->sconf.cipher_string = nfstrdup( cfg->val );
|
||||||
|
} else if (!strcasecmp( "TLSType", cfg->cmd )) {
|
||||||
|
goto tlstype;
|
||||||
} else if (!strcasecmp( "SSLType", cfg->cmd )) {
|
} else if (!strcasecmp( "SSLType", cfg->cmd )) {
|
||||||
|
static int sslt_warned;
|
||||||
|
if (!sslt_warned) {
|
||||||
|
sslt_warned = 1;
|
||||||
|
warn( "Notice: SSLType is deprecated. Use TLSType instead.\n" );
|
||||||
|
}
|
||||||
|
tlstype:
|
||||||
if (!strcasecmp( "None", cfg->val )) {
|
if (!strcasecmp( "None", cfg->val )) {
|
||||||
server->ssl_type = SSL_None;
|
server->ssl_type = SSL_None;
|
||||||
} else if (!strcasecmp( "STARTTLS", cfg->val )) {
|
} else if (!strcasecmp( "STARTTLS", cfg->val )) {
|
||||||
|
@ -3794,7 +3802,7 @@ imap_parse_store( conffile_t *cfg, store_conf_t **storep )
|
||||||
} else if (!strcasecmp( "IMAPS", cfg->val )) {
|
} else if (!strcasecmp( "IMAPS", cfg->val )) {
|
||||||
server->ssl_type = SSL_IMAPS;
|
server->ssl_type = SSL_IMAPS;
|
||||||
} else {
|
} else {
|
||||||
error( "%s:%d: Invalid SSL type\n", cfg->file, cfg->line );
|
error( "%s:%d: Invalid TLS type\n", cfg->file, cfg->line );
|
||||||
cfg->err = 1;
|
cfg->err = 1;
|
||||||
}
|
}
|
||||||
} else if (!strcasecmp( "TLSVersions", cfg->cmd )) {
|
} else if (!strcasecmp( "TLSVersions", cfg->cmd )) {
|
||||||
|
|
|
@ -313,7 +313,7 @@ Define the IMAP4 Account \fIname\fR, opening a section for its parameters.
|
||||||
\fBHost\fR \fIhost\fR
|
\fBHost\fR \fIhost\fR
|
||||||
Specify the DNS name or IP address of the IMAP server.
|
Specify the DNS name or IP address of the IMAP server.
|
||||||
.br
|
.br
|
||||||
If \fBTunnel\fR is used, this setting is needed only if \fBSSLType\fR is
|
If \fBTunnel\fR is used, this setting is needed only if \fBTLSType\fR is
|
||||||
not \fBNone\fR and \fBCertificateFile\fR is not used,
|
not \fBNone\fR and \fBCertificateFile\fR is not used,
|
||||||
in which case the host name is used for certificate subject verification.
|
in which case the host name is used for certificate subject verification.
|
||||||
.
|
.
|
||||||
|
@ -394,13 +394,13 @@ The list of acceptable authentication mechanisms.
|
||||||
In addition to the mechanisms listed in the SASL registry (link below),
|
In addition to the mechanisms listed in the SASL registry (link below),
|
||||||
the legacy IMAP \fBLOGIN\fR mechanism is known.
|
the legacy IMAP \fBLOGIN\fR mechanism is known.
|
||||||
The wildcard \fB*\fR represents all mechanisms that are deemed secure
|
The wildcard \fB*\fR represents all mechanisms that are deemed secure
|
||||||
enough for the current \fBSSLType\fR setting.
|
enough for the current \fBTLSType\fR setting.
|
||||||
The actually used mechanism is the most secure choice from the intersection
|
The actually used mechanism is the most secure choice from the intersection
|
||||||
of this list, the list supplied by the server, and the installed SASL modules.
|
of this list, the list supplied by the server, and the installed SASL modules.
|
||||||
(Default: \fB*\fR)
|
(Default: \fB*\fR)
|
||||||
.
|
.
|
||||||
.TP
|
.TP
|
||||||
\fBSSLType\fR {\fBNone\fR|\fBSTARTTLS\fR|\fBIMAPS\fR}
|
\fBTLSType\fR {\fBNone\fR|\fBSTARTTLS\fR|\fBIMAPS\fR}
|
||||||
Select the connection security/encryption method:
|
Select the connection security/encryption method:
|
||||||
.br
|
.br
|
||||||
\fBNone\fR - no security.
|
\fBNone\fR - no security.
|
||||||
|
@ -410,7 +410,7 @@ This is the default when \fBTunnel\fR is set, as tunnels are usually secure.
|
||||||
after connecting the regular IMAP port 143. Most servers support this,
|
after connecting the regular IMAP port 143. Most servers support this,
|
||||||
so it is the default (unless a tunnel is used).
|
so it is the default (unless a tunnel is used).
|
||||||
.br
|
.br
|
||||||
\fBIMAPS\fR - security is established by starting SSL/TLS negotiation
|
\fBIMAPS\fR - security is established by starting TLS negotiation
|
||||||
right after connecting the secure IMAP port 993.
|
right after connecting the secure IMAP port 993.
|
||||||
.
|
.
|
||||||
.TP
|
.TP
|
||||||
|
|
Loading…
Reference in New Issue
Block a user