CVS commit by ossi:
un-document "Host imaps:[...]" syntax and introduce new option UseIMAPS
instead.
apply ted's patch to support UseIMAPS in conjunction with Tunnel.
document that SSLv2 is No Good (TM).
M +9 -6 drv_imap.c 1.28
M +17 -10 mbsync.1 1.4
--- isync/src/drv_imap.c #1.27:1.28
@@ -1294,4 +1294,5 @@ imap_open_store( store_conf_t *conf,
ctx->buf.sock.fd = s;
+ }
#if HAVE_LIBSSL
@@ -1302,5 +1303,4 @@ imap_open_store( store_conf_t *conf,
}
#endif
- }
/* read the greeting string */
@@ -1714,4 +1714,5 @@ imap_parse_store( conffile_t *cfg, store
while (getcline( cfg ) && cfg->cmd) {
if (!strcasecmp( "Host", cfg->cmd )) {
+ /* The imap[s]: syntax is just a backwards compat hack.
*/
#if HAVE_LIBSSL
if (!memcmp( "imaps:", cfg->val, 6 )) {
@@ -1746,4 +1747,6 @@ imap_parse_store( conffile_t *cfg, store
} else if (!strcasecmp( "RequireSSL", cfg->cmd ))
server->require_ssl = parse_bool( cfg );
+ else if (!strcasecmp( "UseIMAPS", cfg->cmd ))
+ server->use_imaps = parse_bool( cfg );
else if (!strcasecmp( "UseSSLv2", cfg->cmd ))
server->use_sslv2 = parse_bool( cfg );
--- isync/src/mbsync.1 #1.3:1.4
@@ -211,15 +211,11 @@
..
.TP
-\fBHost\fR [\fBimaps:\fR]\fIhost\fR
-Specify the DNS name or IP address of the IMAP server. If \fIhost\fR is
-prefixed with \fBimaps:\fR the connection is assumed to be an SSL connection
-to port 993.
-Note that modern servers support SSL on the default port 143 via the
-STARTTLS extension, which will be used automatically by default.
+\fBHost\fR \fIhost\fR
+Specify the DNS name or IP address of the IMAP server.
..
.TP
\fBPort\fR \fIport\fR
-Specify the TCP port number of the IMAP server. (Default: 143 for imap,
-993 for imaps)
+Specify the TCP port number of the IMAP server. (Default: 143 for IMAP,
+993 for IMAPS)
..
.TP
@@ -246,4 +242,13 @@
..
.TP
+\fBUseIMAPS\fR \fIyes\fR|\fIno\fR
+If set to \fIyes\fR, the default for \fBPort\fR is changed to 993 and
+\fBmbsync\fR will start SSL negotiation immediately after establishing
+the connection to the server.
+.br
+Note that modern servers support SSL on the regular IMAP port 143 via the
+STARTTLS extension, which will be used automatically by default.
+..
+.TP
\fBRequireSSL\fR \fIyes\fR|\fIno\fR
\fBmbsync\fR will abort the connection if a TLS/SSL session cannot be
@@ -258,10 +263,12 @@
\fBUseSSLv2\fR \fIyes\fR|\fIno\fR
Use SSLv2 for communication with the IMAP server over SSL?
-(Default: \fIyes\fR if an imaps \fBHost\fR is used, otherwise \fIno\fR)
+.br
+Note that this option is deprecated for security reasons.
+(Default: \fIno\fR)
..
.TP
\fBUseSSLv3\fR \fIyes\fR|\fIno\fR
Use SSLv3 for communication with the IMAP server over SSL?
-(Default: \fIyes\fR if an imaps \fBHost\fR is used, otherwise \fIno\fR)
+(Default: \fIno\fR)
..
.TP
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel
