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

don't hang after failed start_tls()

Browse Source 
we'd send a LOGOUT command in plain text while the server was already
expecting an encrypted command, which would typically lead to waiting
for more data and thus an indefinite hang.
so close the socket immediately instead of letting the normal shutdown
path take care of it.
inspired by a patch by Steven Flintham.

-REFMAIL: 4C9AB98E.3000400@lemma.co.uk
This commit is contained in:
Oswald Buddenhagen 2010-10-03 11:53:18 +02:00
parent 608a2863e0
commit 2d5a73c55d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drv_imap.c
View File

@ -1280,7 +1280,7 @@ imap_open_store( store_conf_t *conf, store_t *oldctx )
#if HAVE_LIBSSL #if HAVE_LIBSSL
if (srvc->use_imaps) { if (srvc->use_imaps) {
if (start_tls( ctx )) if (start_tls( ctx ))
goto bail; goto ssl_bail;
use_ssl = 1; use_ssl = 1;
} }
#endif #endif
@ -1314,7 +1314,7 @@ imap_open_store( store_conf_t *conf, store_t *oldctx )
if (imap_exec( ctx, 0, "STARTTLS" ) != RESP_OK) if (imap_exec( ctx, 0, "STARTTLS" ) != RESP_OK)
goto bail; goto bail;
if (start_tls( ctx )) if (start_tls( ctx ))
goto bail; goto ssl_bail;
use_ssl = 1; use_ssl = 1;
if (imap_exec( ctx, 0, "CAPABILITY" ) != RESP_OK) if (imap_exec( ctx, 0, "CAPABILITY" ) != RESP_OK)
@ -1399,6 +1399,12 @@ imap_open_store( store_conf_t *conf, store_t *oldctx )
ctx->trashnc = 1; ctx->trashnc = 1;
return (store_t *)ctx; return (store_t *)ctx;
#if HAVE_LIBSSL
ssl_bail:
/* This avoids that we try to send LOGOUT to an unusable socket. */
close( imap->buf.sock.fd );
imap->buf.sock.fd = -1;
#endif
bail: bail:
imap_close_store( &ctx->gen ); imap_close_store( &ctx->gen );
return 0; return 0;