commit 6494cfc4384e2448c4a26d868ce18dd24df3e3b6
Author: Oswald Buddenhagen <[email protected]>
Date: Wed Nov 1 07:14:50 2006 +0000
backport: move assigning default port to the place of use
src/drv_imap.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/drv_imap.c b/src/drv_imap.c
index 2f215d8..8b5cea7 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -1242,7 +1242,11 @@ imap_open_store( store_conf_t *conf, store_t *oldctx )
info( "ok\n" );
} 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;
info( "Resolving %s... ", srvc->host );
@@ -1728,15 +1732,11 @@ imap_parse_store( conffile_t *cfg, store_conf_t
**storep, int *err )
server->use_imaps = 1;
server->use_sslv2 = 1;
server->use_sslv3 = 1;
- if (!server->port)
- server->port = 993;
} else
#endif
{
if (!memcmp( "imap:", cfg->val, 5 ))
cfg->val += 5;
- if (!server->port)
- server->port = 143;
}
if (!memcmp( "//", cfg->val, 2 ))
cfg->val += 2;
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
_______________________________________________
isync-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/isync-devel
