From 022d3fe73f7249c0ddc5c2e8a01dacaf10400ca4 Mon Sep 17 00:00:00 2001 From: pfelt Date: Thu, 11 Oct 2007 08:14:54 +0000 Subject: [PATCH] -- we were overriding the capabilities (and a few other things) and causing issues with tbird. --- src/agents/imap/imapd.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/agents/imap/imapd.c b/src/agents/imap/imapd.c index 423b035..63927c2 100644 --- a/src/agents/imap/imapd.c +++ b/src/agents/imap/imapd.c @@ -3388,6 +3388,9 @@ InitializeImapGlobals() Imap.server.port = 143; Imap.server.ssl.port = 993; Imap.server.ssl.enable = FALSE; + Imap.server.ssl.config.options = 0; + Imap.server.ssl.config.options |= SSL_ALLOW_CHAIN; + Imap.server.ssl.config.options |= SSL_ALLOW_SSL3; Imap.server.threadGroupId = XplGetThreadGroupID(); Imap.server.hostname[0] = '\0'; Imap.server.hostnameLen = 0; @@ -3738,17 +3741,6 @@ ReadConfiguration(void) localtime_r(&time_of_day, <m); gm_time_of_day=mktime(&gm); - // not totally sure what acl.enabled == TRUE does? - Imap.command.capability.acl.enabled = FALSE; - Imap.command.capability.len = sprintf(Imap.command.capability.message, - "%s\r\n", "* CAPABILITY IMAP4 IMAP4rev1 AUTH=LOGIN NAMESPACE XSENDER"); - Imap.command.capability.ssl.len = sprintf(Imap.command.capability.ssl.message, - "%s\r\n", "* CAPABILITY IMAP4 IMAP4rev1 AUTH=LOGIN NAMESPACE STARTTLS XSENDER LOGINDISABLED"); - Imap.server.ssl.config.options = 0; - Imap.server.ssl.config.options |= SSL_ALLOW_CHAIN; - Imap.server.ssl.config.options |= SSL_ALLOW_SSL3; - Imap.server.ssl.enable = TRUE; - gethostname(Imap.server.hostname, sizeof(Imap.server.hostname)); Imap.server.hostnameLen = strlen(Imap.server.hostname);