don't use STARTTLS for PREAUTH connections. uw-imap doesn't seem to like

it, and it does not make too much sense anyway - i think - state converse
opinions now.
This commit is contained in:
Oswald Buddenhagen 2004-01-20 01:55:15 +00:00
parent 3b91742ead
commit 1eb6e35c80

View File

@ -742,6 +742,9 @@ imap_connect (config_t * cfg)
if (imap_exec (imap, "CAPABILITY")) if (imap_exec (imap, "CAPABILITY"))
goto bail; goto bail;
if (!preauth)
{
#if HAVE_LIBSSL #if HAVE_LIBSSL
if (!cfg->use_imaps) if (!cfg->use_imaps)
{ {
@ -780,8 +783,6 @@ imap_connect (config_t * cfg)
} }
#endif #endif
if (!preauth)
{
info ("Logging in...\n"); info ("Logging in...\n");
if (!cfg->pass) if (!cfg->pass)
@ -842,7 +843,7 @@ imap_connect (config_t * cfg)
goto bail; goto bail;
} }
} }
} } /* !preauth */
/* get NAMESPACE info */ /* get NAMESPACE info */
if (cfg->use_namespace && imap->have_namespace) if (cfg->use_namespace && imap->have_namespace)