commit 95eb906e88cd62c03246922898f8e9aac467cfde
Author: Oswald Buddenhagen <[email protected]>
Date: Wed Dec 15 19:01:27 2010 +0100
remove redundant use_ssl variable
src/drv_imap.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/src/drv_imap.c b/src/drv_imap.c
index 9c4982d..92777b7 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -1310,9 +1310,6 @@ imap_open_store( store_conf_t *conf,
struct hostent *he;
struct sockaddr_in addr;
int s, a[2], preauth;
-#if HAVE_LIBSSL
- int use_ssl;
-#endif
for (ctxp = &unowned; (ctx = (imap_store_t *)*ctxp); ctxp =
&ctx->gen.next)
if (((imap_store_conf_t *)ctx->gen.conf)->server == srvc) {
@@ -1332,10 +1329,6 @@ imap_open_store( store_conf_t *conf,
ctx->in_progress_append = &ctx->in_progress;
/* open connection to IMAP server */
-#if HAVE_LIBSSL
- use_ssl = 0;
-#endif
-
if (srvc->tunnel) {
infon( "Starting tunnel '%s'... ", srvc->tunnel );
@@ -1398,7 +1391,6 @@ imap_open_store( store_conf_t *conf,
if (srvc->use_imaps) {
if (start_tls( ctx ))
goto ssl_bail;
- use_ssl = 1;
}
#endif
@@ -1430,7 +1422,6 @@ imap_open_store( store_conf_t *conf,
goto bail;
if (start_tls( ctx ))
goto ssl_bail;
- use_ssl = 1;
if (imap_exec( ctx, 0, "CAPABILITY" ) !=
RESP_OK)
goto bail;
@@ -1486,7 +1477,7 @@ imap_open_store( store_conf_t *conf,
goto bail;
}
#if HAVE_LIBSSL
- if (!use_ssl)
+ if (!ctx->buf.sock.use_ssl)
#endif
warn( "*** IMAP Warning *** Password is being
sent in the clear\n" );
if (imap_exec( ctx, 0, "LOGIN \"%s\" \"%s\"",
srvc->user, srvc->pass ) != RESP_OK) {
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
isync-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/isync-devel
