CVS commit by ossi: 

backport: move assigning default port to the place of use


  M +5 -5      drv_imap.c   1.10.2.3


--- isync/src/drv_imap.c  #1.10.2.2:1.10.2.3
@@ -1243,5 +1243,9 @@ imap_open_store( store_conf_t *conf, sto
        } else {
                memset( &addr, 0, sizeof(addr) );
-               addr.sin_port = htons( srvc->port );
+               addr.sin_port = htons( srvc->port ? srvc->port :
+#ifdef HAVE_LIBSSL
+                                      srvc->use_imaps ? 993 :
+#endif
+                                      143 );
                addr.sin_family = AF_INET;
 
@@ -1729,6 +1733,4 @@ imap_parse_store( conffile_t *cfg, store
                                server->use_sslv2 = 1;
                                server->use_sslv3 = 1;
-                               if (!server->port)
-                                       server->port = 993;
                        } else
 #endif
@@ -1736,6 +1738,4 @@ imap_parse_store( conffile_t *cfg, store
                                if (!memcmp( "imap:", cfg->val, 5 ))
                                        cfg->val += 5;
-                               if (!server->port)
-                                       server->port = 143;
                        }
                        if (!memcmp( "//", cfg->val, 2 ))



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel

Reply via email to