lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport: move assigning default port to the place of use

Browse Source
This commit is contained in:
Oswald Buddenhagen 2006-11-01 07:14:50 +00:00
parent afc48600fa
commit 6494cfc438
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drv_imap.c
View File

@ -1242,7 +1242,11 @@ imap_open_store( store_conf_t *conf, store_t *oldctx )
info( "ok\n" ); info( "ok\n" );
} else { } else {
memset( &addr, 0, sizeof(addr) ); 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; addr.sin_family = AF_INET;
info( "Resolving %s... ", srvc->host ); 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_imaps = 1;
server->use_sslv2 = 1; server->use_sslv2 = 1;
server->use_sslv3 = 1; server->use_sslv3 = 1;
if (!server->port)
server->port = 993;
} else } else
#endif #endif
{ {
if (!memcmp( "imap:", cfg->val, 5 )) if (!memcmp( "imap:", cfg->val, 5 ))
cfg->val += 5; cfg->val += 5;
if (!server->port)
server->port = 143;
} }
if (!memcmp( "//", cfg->val, 2 )) if (!memcmp( "//", cfg->val, 2 ))
cfg->val += 2; cfg->val += 2;