geos_one/bongo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

r556 should have fixed bug 10295, but apparently i didn't get it all. this should complete the fix

Browse Source
This commit is contained in:
pfelt
2007-12-08 16:25:31 +00:00
parent 7e96de2317
commit 90b8aed904
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/agents/imap/imapd.c
+7 -23
View File
@@ -846,13 +846,6 @@ ImapCommandCapability(void *param)
ImapSession *session = (ImapSession *)param;
if ((ccode = EventsSend(session, STORE_EVENT_ALL)) == STATUS_CONTINUE) {
if (!Imap.server.ssl.enable || session->client.conn->ssl.enable) {
if (ConnWrite(session->client.conn, Imap.command.capability.message, Imap.command.capability.len) != -1) {
return(SendOk(session, "CAPABILITY"));
}
return(STATUS_ABORT);
}
if (ConnWrite(session->client.conn, Imap.command.capability.ssl.message, Imap.command.capability.ssl.len) != -1) {
return(SendOk(session, "CAPABILITY"));
}
@@ -3374,7 +3367,6 @@ InitializeImapGlobals()
Imap.server.disabled = FALSE;
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;
@@ -3730,8 +3722,6 @@ ReadConfiguration(void)
return FALSE;
}
Imap.server.ssl.enable = TRUE;
return(TRUE);
}
@@ -3792,21 +3782,15 @@ XplServiceMain(int argc, char *argv[])
return -1;
}
if (Imap.server.ssl.enable) {
if (!ServerSocketSSLInit()) {
Imap.server.ssl.config.certificate.file = MsgGetFile(MSGAPI_FILE_PUBKEY, NULL, 0);
Imap.server.ssl.config.key.file = MsgGetFile(MSGAPI_FILE_PRIVKEY, NULL, 0);
if (!ServerSocketSSLInit()) {
Imap.server.ssl.config.certificate.file = MsgGetFile(MSGAPI_FILE_PUBKEY, NULL, 0);
Imap.server.ssl.config.key.file = MsgGetFile(MSGAPI_FILE_PRIVKEY, NULL, 0);
Imap.server.ssl.config.key.type = GNUTLS_X509_FMT_PEM;
Imap.server.ssl.config.key.type = GNUTLS_X509_FMT_PEM;
Imap.server.ssl.context = ConnSSLContextAlloc(&(Imap.server.ssl.config));
if (Imap.server.ssl.context) {
XplBeginCountedThread(&id, IMAPSSLServer, IMAP_STACK_SIZE, NULL, ccode, Imap.server.active);
} else {
Imap.server.ssl.enable = FALSE;
}
} else {
Imap.server.ssl.enable = FALSE;
Imap.server.ssl.context = ConnSSLContextAlloc(&(Imap.server.ssl.config));
if (Imap.server.ssl.context) {
XplBeginCountedThread(&id, IMAPSSLServer, IMAP_STACK_SIZE, NULL, ccode, Imap.server.active);
}
}
src/agents/imap/imapd.h
-2
View File
@@ -353,8 +353,6 @@ typedef struct {
struct {
struct {
BOOL enable;
ConnSSLConfiguration config;
bongo_ssl_context *context;