X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fserv_imap.c;h=3bc08c213502919294dcffe5a08b3489f43edd52;hb=8e944083763c9ddcb32d763cf8f19c966d01f873;hp=eca14eb05ac6f52b80433d4b1ad3badc0cb69eeb;hpb=4d6e024cd615c34bdc4b9d9aae90d9942f66cc9a;p=citadel.git

diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c
index eca14eb05..3bc08c213 100644
--- a/citadel/modules/imap/serv_imap.c
+++ b/citadel/modules/imap/serv_imap.c
@@ -1,7 +1,7 @@
 /*
  * IMAP server for the Citadel system
  *
- * Copyright (C) 2000-2011 by Art Cancro and others.
+ * Copyright (C) 2000-2021 by Art Cancro and others.
  * This code is released under the terms of the GNU General Public License.
  *
  * WARNING: the IMAP protocol is badly designed.  No implementation of it
@@ -17,10 +17,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -69,7 +65,6 @@
 #include "imap_misc.h"
 
 #include "ctdl_module.h"
-
 HashList *ImapCmds = NULL;
 void registerImapCMD(const char *First, long FLen, 
 		     const char *Second, long SLen,
@@ -95,15 +90,12 @@ void registerImapCMD(const char *First, long FLen,
 	}
 }
 
-void imap_cleanup(void)
-{
-	DeleteHash(&ImapCmds);
-}
 
 const imap_handler_hook *imap_lookup(int num_parms, ConstStr *Params)
 {
+	struct CitContext *CCC = CC;
 	void *v;
-	citimap *Imap = IMAP;
+	citimap *Imap = CCCIMAP;
 
 	if (num_parms < 1)
 		return NULL;
@@ -112,8 +104,7 @@ const imap_handler_hook *imap_lookup(int num_parms, ConstStr *Params)
 	StrBufPlain(Imap->Reply, CKEY(Params[1]));
 	StrBufUpCase(Imap->Reply);
 
-	syslog(LOG_DEBUG, "---- Looking up [%s] -----", 
-		      ChrPtr(Imap->Reply));
+	syslog(LOG_DEBUG, "---- Looking up [%s] -----", ChrPtr(Imap->Reply));
 	if (GetHash(ImapCmds, SKEY(Imap->Reply), &v))
 	{
 		syslog(LOG_DEBUG, "Found."); 
@@ -128,8 +119,7 @@ const imap_handler_hook *imap_lookup(int num_parms, ConstStr *Params)
 		return NULL;
 	}
 	
-	syslog(LOG_DEBUG, "---- Looking up [%s] -----", 
-		      ChrPtr(Imap->Reply));
+	syslog(LOG_DEBUG, "---- Looking up [%s] -----", ChrPtr(Imap->Reply));
 	StrBufAppendBufPlain(Imap->Reply, CKEY(Params[2]), 0);
 	StrBufUpCase(Imap->Reply);
 	if (GetHash(ImapCmds, SKEY(Imap->Reply), &v))
@@ -292,7 +282,7 @@ void imap_add_single_msgid(long msgnum, void *userdata)
 	if (Imap->num_msgs > Imap->num_alloc) {
 		Imap->num_alloc += REALLOC_INCREMENT;
 		Imap->msgids = realloc(Imap->msgids, (Imap->num_alloc * sizeof(long)) );
-		Imap->flags = realloc(Imap->flags, (Imap->num_alloc * sizeof(long)) );
+		Imap->flags = realloc(Imap->flags, (Imap->num_alloc * sizeof(unsigned int)) );
 	}
 	Imap->msgids[Imap->num_msgs - 1] = msgnum;
 	Imap->flags[Imap->num_msgs - 1] = 0;
@@ -305,8 +295,9 @@ void imap_add_single_msgid(long msgnum, void *userdata)
  */
 void imap_load_msgids(void)
 {
+	struct CitContext *CCC = CC;
 	struct cdbdata *cdbfr;
-	citimap *Imap = IMAP;
+	citimap *Imap = CCCIMAP;
 
 	if (Imap->selected == 0) {
 		syslog(LOG_ERR, "imap_load_msgids() can't run; no room selected");
@@ -318,16 +309,17 @@ void imap_load_msgids(void)
 	/* Load the message list */
 	cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
 	if (cdbfr != NULL) {
-		Imap->msgids = malloc(cdbfr->len);
-		memcpy(Imap->msgids, cdbfr->ptr, cdbfr->len);
+		Imap->msgids = (long*)cdbfr->ptr;
 		Imap->num_msgs = cdbfr->len / sizeof(long);
 		Imap->num_alloc = cdbfr->len / sizeof(long);
+		cdbfr->ptr = NULL;
+		cdbfr->len = 0;
 		cdb_free(cdbfr);
 	}
 
 	if (Imap->num_msgs) {
-		Imap->flags = malloc(Imap->num_alloc * sizeof(long));
-		memset(Imap->flags, 0, (Imap->num_alloc * sizeof(long)) );
+		Imap->flags = malloc(Imap->num_alloc * sizeof(unsigned int));
+		memset(Imap->flags, 0, (Imap->num_alloc * sizeof(unsigned int)) );
 	}
 
 	imap_set_seen_flags(0);
@@ -339,7 +331,8 @@ void imap_load_msgids(void)
  */
 void imap_rescan_msgids(void)
 {
-	citimap *Imap = IMAP;
+	struct CitContext *CCC = CC;
+	citimap *Imap = CCCIMAP;
 	int original_num_msgs = 0;
 	long original_highest = 0L;
 	int i, j, jstart;
@@ -368,14 +361,10 @@ void imap_rescan_msgids(void)
 	 */
 	cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
 	if (cdbfr != NULL) {
-		msglist = malloc(cdbfr->len + 1);
-		if (msglist == NULL) {
-			syslog(LOG_CRIT, "IMAP: malloc() failed");
-			CC->kill_me = KILLME_MALLOC_FAILED;
-			return;
-		}
-		memcpy(msglist, cdbfr->ptr, (size_t)cdbfr->len);
+		msglist = (long*)cdbfr->ptr;
+		cdbfr->ptr = NULL;
 		num_msgs = cdbfr->len / sizeof(long);
+		cdbfr->len = 0;
 		cdb_free(cdbfr);
 	} else {
 		num_msgs = 0;
@@ -414,9 +403,8 @@ void imap_rescan_msgids(void)
 					 (Imap->num_msgs - i)));
 				memmove(&Imap->flags[i],
 					&Imap->flags[i + 1],
-					(sizeof(long) *
+					(sizeof(unsigned int) *
 					 (Imap->num_msgs - i)));
-
 				--i;
 			}
 
@@ -475,7 +463,8 @@ void imap_rescan_msgids(void)
  */
 void imap_cleanup_function(void)
 {
-	citimap *Imap = IMAP;
+	struct CitContext *CCC = CC;
+	citimap *Imap = CCCIMAP;
 
 	/* Don't do this stuff if this is not a Imap session! */
 	if (CC->h_command_function != imap_command_loop)
@@ -599,7 +588,7 @@ void imap_greeting(void)
 
 	IAPuts("* OK [");
 	imap_output_capability_string();
-	IAPrintf("] %s IMAP4rev1 %s ready\r\n", config.c_fqdn, CITADEL);
+	IAPrintf("] %s IMAP4rev1 %s ready\r\n", CtdlGetConfigStr("c_fqdn"), CITADEL);
 	IUnbuffer();
 }
 
@@ -635,7 +624,7 @@ void imap_login(int num_parms, ConstStr *Params)
 			return;
 		}
 	case 4:
-		if (CtdlLoginExistingUser(NULL, Params[2].Key) == login_ok) {
+		if (CtdlLoginExistingUser(Params[2].Key) == login_ok) {
 			if (CtdlTryPassword(Params[3].Key, Params[3].len) == pass_ok) {
 				/* hm, thats not doable by IReply :-( */
 				IAPrintf("%s OK [", Params[0].Key);
@@ -645,12 +634,13 @@ void imap_login(int num_parms, ConstStr *Params)
 			}
 			else
 			{
-				IReplyPrintf("NO AUTHENTICATE %s failed",
-					     Params[3].Key);
+				IReplyPrintf("NO AUTHENTICATE %s failed", Params[3].Key);
+				return;
 			}
 		}
 
 		IReply("BAD Login incorrect");
+		return;
 	default:
 		IReply("BAD incorrect number of parameters");
 		return;
@@ -677,7 +667,11 @@ void imap_authenticate(int num_parms, ConstStr *Params)
 	}
 
 	if (!strcasecmp(Params[2].Key, "LOGIN")) {
-		CtdlEncodeBase64(UsrBuf, "Username:", 9, 0);
+		size_t len = CtdlEncodeBase64(UsrBuf, "Username:", 9, 0);
+		if (UsrBuf[len - 1] == '\n') {
+			UsrBuf[len - 1] = '\0';
+		}
+
 		IAPrintf("+ %s\r\n", UsrBuf);
 		IMAP->authstate = imap_as_expecting_username;
 		strcpy(IMAP->authseq, Params[0].Key);
@@ -685,7 +679,10 @@ void imap_authenticate(int num_parms, ConstStr *Params)
 	}
 
 	if (!strcasecmp(Params[2].Key, "PLAIN")) {
-		// CtdlEncodeBase64(UsrBuf, "Username:", 9, 0);
+		// size_t len = CtdlEncodeBase64(UsrBuf, "Username:", 9, 0);
+		// if (UsrBuf[len - 1] == '\n') {
+		//   UsrBuf[len - 1] = '\0';
+		// }
 		// IAPuts("+ %s\r\n", UsrBuf);
 		IAPuts("+ \r\n");
 		IMAP->authstate = imap_as_expecting_plainauth;
@@ -704,33 +701,53 @@ void imap_auth_plain(void)
 {
 	citimap *Imap = IMAP;
 	const char *decoded_authstring;
-	char ident[256];
-	char user[256];
-	char pass[256];
+	char ident[256] = "";
+	char user[256] = "";
+	char pass[256] = "";
 	int result;
-	long len;
+	long decoded_len;
+	long len = 0;
+	long plen = 0;
 
 	memset(pass, 0, sizeof(pass));
-	StrBufDecodeBase64(Imap->Cmd.CmdBuf);
+	decoded_len = StrBufDecodeBase64(Imap->Cmd.CmdBuf);
 
-	decoded_authstring = ChrPtr(Imap->Cmd.CmdBuf);
-	safestrncpy(ident, decoded_authstring, sizeof ident);
-	safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user);
-	len = safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass);
-	if (len < 0)
-		len = sizeof(pass) - 1;
+	if (decoded_len > 0)
+	{
+		decoded_authstring = ChrPtr(Imap->Cmd.CmdBuf);
+
+		len = safestrncpy(ident, decoded_authstring, sizeof ident);
+
+		decoded_len -= len - 1;
+		decoded_authstring += len + 1;
 
+		if (decoded_len > 0)
+		{
+			len = safestrncpy(user, decoded_authstring, sizeof user);
+
+			decoded_authstring += len + 1;
+			decoded_len -= len - 1;
+		}
+
+		if (decoded_len > 0)
+		{
+			plen = safestrncpy(pass, decoded_authstring, sizeof pass);
+
+			if (plen < 0)
+				plen = sizeof(pass) - 1;
+		}
+	}
 	Imap->authstate = imap_as_normal;
 
 	if (!IsEmptyStr(ident)) {
-		result = CtdlLoginExistingUser(user, ident);
+		result = CtdlLoginExistingUser(ident);
 	}
 	else {
-		result = CtdlLoginExistingUser(NULL, user);
+		result = CtdlLoginExistingUser(user);
 	}
 
 	if (result == login_ok) {
-		if (CtdlTryPassword(pass, len) == pass_ok) {
+		if (CtdlTryPassword(pass, plen) == pass_ok) {
 			IAPrintf("%s OK authentication succeeded\r\n", Imap->authseq);
 			return;
 		}
@@ -747,15 +764,19 @@ void imap_auth_login_user(long state)
 	switch (state){
 	case imap_as_expecting_username:
 		StrBufDecodeBase64(Imap->Cmd.CmdBuf);
-		CtdlLoginExistingUser(NULL, ChrPtr(Imap->Cmd.CmdBuf));
-		CtdlEncodeBase64(PWBuf, "Password:", 9, 0);
+		CtdlLoginExistingUser(ChrPtr(Imap->Cmd.CmdBuf));
+		size_t len = CtdlEncodeBase64(PWBuf, "Password:", 9, 0);
+		if (PWBuf[len - 1] == '\n') {
+			PWBuf[len - 1] = '\0';
+		}
+
 		IAPrintf("+ %s\r\n", PWBuf);
 		
 		Imap->authstate = imap_as_expecting_password;
 		return;
 	case imap_as_expecting_multilineusername:
 		extract_token(PWBuf, ChrPtr(Imap->Cmd.CmdBuf), 1, ' ', sizeof(PWBuf));
-		CtdlLoginExistingUser(NULL, ChrPtr(Imap->Cmd.CmdBuf));
+		CtdlLoginExistingUser(ChrPtr(Imap->Cmd.CmdBuf));
 		IAPuts("+ go ahead\r\n");
 		Imap->authstate = imap_as_expecting_multilinepassword;
 		return;
@@ -870,7 +891,7 @@ void imap_select(int num_parms, ConstStr *Params)
 	 * the number of messages and number of new messages.
 	 */
 	memcpy(&CC->room, &QRscratch, sizeof(struct ctdlroom));
-	CtdlUserGoto(NULL, 0, 0, &msgs, &new);
+	CtdlUserGoto(NULL, 0, 0, &msgs, &new, NULL, NULL);
 	Imap->selected = 1;
 
 	if (!strcasecmp(Params[1].Key, "EXAMINE")) {
@@ -886,7 +907,7 @@ void imap_select(int num_parms, ConstStr *Params)
 	IAPrintf("* %d RECENT\r\n", new);
 
 	IAPrintf("* OK [UIDVALIDITY %ld] UID validity status\r\n", GLOBAL_UIDVALIDITY_VALUE);
-	IAPrintf("* OK [UIDNEXT %ld] Predicted next UID\r\n", CitControl.MMhighest + 1);
+	IAPrintf("* OK [UIDNEXT %ld] Predicted next UID\r\n", CtdlGetConfigLong("MMhighest") + 1);
 
 	/* Technically, \Deleted is a valid flag, but not a permanent flag,
 	 * because we don't maintain its state across sessions.  Citadel
@@ -911,7 +932,8 @@ void imap_select(int num_parms, ConstStr *Params)
  */
 int imap_do_expunge(void)
 {
-	citimap *Imap = IMAP;
+	struct CitContext *CCC = CC;
+	citimap *Imap = CCCIMAP;
 	int i;
 	int num_expunged = 0;
 	long *delmsgs = NULL;
@@ -980,6 +1002,7 @@ void imap_close(int num_parms, ConstStr *Params)
  */
 void imap_namespace(int num_parms, ConstStr *Params)
 {
+	long len;
 	int i;
 	struct floor *fl;
 	int floors = 0;
@@ -1000,8 +1023,8 @@ void imap_namespace(int num_parms, ConstStr *Params)
 		if (fl->f_flags & F_INUSE) {
 			/* if (floors > 0) IAPuts(" "); samjam says this confuses javamail */
 			IAPuts("(");
-			snprintf(Namespace, sizeof(Namespace), "%s/", fl->f_name);
-			plain_imap_strout(Namespace);
+			len = snprintf(Namespace, sizeof(Namespace), "%s/", fl->f_name);
+			IPutStr(Namespace, len);
 			IAPuts(" \"/\")");
 			++floors;
 		}
@@ -1035,14 +1058,14 @@ void imap_create(int num_parms, ConstStr *Params)
 
 	if (strchr(Params[2].Key, '\\') != NULL) {
 		IReply("NO Invalid character in folder name");
-		syslog(LOG_DEBUG, "invalid character in folder name");
+		syslog(LOG_ERR, "invalid character in folder name");
 		return;
 	}
 
 	ret = imap_roomname(roomname, sizeof roomname, Params[2].Key);
 	if (ret < 0) {
 		IReply("NO Invalid mailbox name or location");
-		syslog(LOG_DEBUG, "invalid mailbox name or location");
+		syslog(LOG_ERR, "invalid mailbox name or location");
 		return;
 	}
 	floornum = (ret & 0x00ff);	/* lower 8 bits = floor number */
@@ -1051,7 +1074,7 @@ void imap_create(int num_parms, ConstStr *Params)
 	if (flags & IR_MAILBOX) {
 		if (strncasecmp(Params[2].Key, "INBOX/", 6)) {
 			IReply("NO Personal folders must be created under INBOX");
-			syslog(LOG_DEBUG, "not subordinate to inbox");
+			syslog(LOG_ERR, "not subordinate to inbox");
 			return;
 		}
 	}
@@ -1064,8 +1087,8 @@ void imap_create(int num_parms, ConstStr *Params)
 		newroomview = VIEW_BBS;
 	}
 
-	syslog(LOG_INFO, "IMAP: Create new room <%s> on floor <%d> with type <%d>",
-		roomname, floornum, newroomtype);
+	syslog(LOG_INFO, "Create new room <%s> on floor <%d> with type <%d>",
+		    roomname, floornum, newroomtype);
 
 	ret = CtdlCreateRoom(roomname, newroomtype, "", floornum, 1, 0, newroomview);
 	if (ret == 0) {
@@ -1152,6 +1175,7 @@ int imap_grabroom(char *returned_roomname, const char *foldername, int zapped_ok
  */
 void imap_status(int num_parms, ConstStr *Params)
 {
+	long len;
 	int ret;
 	char roomname[ROOMNAMELEN];
 	char imaproomname[SIZ];
@@ -1172,7 +1196,7 @@ void imap_status(int num_parms, ConstStr *Params)
 	if (IMAP->selected) {
 		strcpy(savedroom, CC->room.QRname);
 	}
-	CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+	CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
 	/*
 	 * Tell the client what it wants to know.  In fact, tell it *more* than
@@ -1180,12 +1204,12 @@ void imap_status(int num_parms, ConstStr *Params)
 	 * names and simply spew all possible data items.  It's far easier to
 	 * code and probably saves us some processing time too.
 	 */
-	imap_mailboxname(imaproomname, sizeof imaproomname, &CC->room);
+	len = imap_mailboxname(imaproomname, sizeof imaproomname, &CC->room);
 	IAPuts("* STATUS ");
-	       plain_imap_strout(imaproomname);
+	IPutStr(imaproomname, len);
 	IAPrintf(" (MESSAGES %d ", msgs);
 	IAPrintf("RECENT %d ", new);	/* Initially, new==recent */
-	IAPrintf("UIDNEXT %ld ", CitControl.MMhighest + 1);
+	IAPrintf("UIDNEXT %ld ", CtdlGetConfigLong("MMhighest") + 1);
 	IAPrintf("UNSEEN %d)\r\n", new);
 	
 	/*
@@ -1193,7 +1217,7 @@ void imap_status(int num_parms, ConstStr *Params)
 	 * our happy day without violent explosions.
 	 */
 	if (IMAP->selected) {
-		CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+		CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
 	}
 
 	/*
@@ -1231,14 +1255,14 @@ void imap_subscribe(int num_parms, ConstStr *Params)
 	if (IMAP->selected) {
 		strcpy(savedroom, CC->room.QRname);
 	}
-	CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+	CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
 	/*
 	 * If another folder is selected, go back to that room so we can resume
 	 * our happy day without violent explosions.
 	 */
 	if (IMAP->selected) {
-		CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+		CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
 	}
 
 	IReply("OK SUBSCRIBE completed");
@@ -1268,7 +1292,7 @@ void imap_unsubscribe(int num_parms, ConstStr *Params)
 	if (IMAP->selected) {
 		strcpy(savedroom, CC->room.QRname);
 	}
-	CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+	CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
 	/* 
 	 * Now make the API call to zap the room
@@ -1284,7 +1308,7 @@ void imap_unsubscribe(int num_parms, ConstStr *Params)
 	 * our happy day without violent explosions.
 	 */
 	if (IMAP->selected) {
-		CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+		CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
 	}
 }
 
@@ -1314,7 +1338,7 @@ void imap_delete(int num_parms, ConstStr *Params)
 	if (IMAP->selected) {
 		strcpy(savedroom, CC->room.QRname);
 	}
-	CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+	CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
 	/*
 	 * Now delete the room.
@@ -1331,7 +1355,7 @@ void imap_delete(int num_parms, ConstStr *Params)
 	 * our happy day without violent explosions.
 	 */
 	if (IMAP->selected) {
-		CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+		CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
 	}
 }
 
@@ -1451,7 +1475,7 @@ void imap_rename(int num_parms, ConstStr *Params)
 					   irl->irl_newfloor);
 			if (r != crr_ok) {
 				/* FIXME handle error returns better */
-				syslog(LOG_ERR, "IMAP: CtdlRenameRoom() error %d", r);
+				syslog(LOG_ERR, "CtdlRenameRoom() error %d", r);
 			}
 			irlp = irl;
 			irl = irl->next;
@@ -1475,6 +1499,7 @@ void imap_rename(int num_parms, ConstStr *Params)
  */
 void imap_command_loop(void)
 {
+	struct CitContext *CCC = CC;
 	struct timeval tv1, tv2;
 	suseconds_t total_time = 0;
 	citimap *Imap;
@@ -1482,8 +1507,8 @@ void imap_command_loop(void)
 	const imap_handler_hook *h;
 
 	gettimeofday(&tv1, NULL);
-	CC->lastcmd = time(NULL);
-	Imap = IMAP;
+	CCC->lastcmd = time(NULL);
+	Imap = CCCIMAP;
 
 	flush_output();
 	if (Imap->Cmd.CmdBuf == NULL)
@@ -1492,23 +1517,23 @@ void imap_command_loop(void)
 		FlushStrBuf(Imap->Cmd.CmdBuf);
 
 	if (CtdlClientGetLine(Imap->Cmd.CmdBuf) < 1) {
-		syslog(LOG_ERR, "IMAP: client disconnected: ending session.");
+		syslog(LOG_ERR, "client disconnected: ending session.");
 		CC->kill_me = KILLME_CLIENT_DISCONNECTED;
 		return;
 	}
 
 	if (Imap->authstate == imap_as_expecting_password) {
-		syslog(LOG_INFO, "IMAP: <password>");
+		syslog(LOG_INFO, "<password>");
 	}
 	else if (Imap->authstate == imap_as_expecting_plainauth) {
-		syslog(LOG_INFO, "IMAP: <plain_auth>");
+		syslog(LOG_INFO, "<plain_auth>");
 	}
 	else if ((Imap->authstate == imap_as_expecting_multilineusername) || 
 		 cbmstrcasestr(ChrPtr(Imap->Cmd.CmdBuf), " LOGIN ")) {
-		syslog(LOG_INFO, "IMAP: LOGIN...");
+		syslog(LOG_INFO, "LOGIN...");
 	}
 	else {
-		syslog(LOG_INFO, "IMAP: %s", ChrPtr(Imap->Cmd.CmdBuf));
+		syslog(LOG_DEBUG, "%s", ChrPtr(Imap->Cmd.CmdBuf));
 	}
 
 	pchs = ChrPtr(Imap->Cmd.CmdBuf);
@@ -1565,13 +1590,13 @@ void imap_command_loop(void)
 	for (i=0; i < Imap->Cmd.num_parms; i++) {
 		if (Imap->Cmd.Params[i].len != strlen(Imap->Cmd.Params[i].Key))
 			syslog(LOG_DEBUG, "*********** %ld != %ld : %s",
-				      Imap->Cmd.Params[i].len, 
-				      strlen(Imap->Cmd.Params[i].Key),
+				    Imap->Cmd.Params[i].len, 
+				    strlen(Imap->Cmd.Params[i].Key),
 				      Imap->Cmd.Params[i].Key);
 		else
 			syslog(LOG_DEBUG, "%ld : %s",
-				      Imap->Cmd.Params[i].len, 
-				      Imap->Cmd.Params[i].Key);
+				    Imap->Cmd.Params[i].len, 
+				    Imap->Cmd.Params[i].Key);
 	}}
 #endif
 
@@ -1623,9 +1648,9 @@ BAIL:
 	gettimeofday(&tv2, NULL);
 	total_time = (tv2.tv_usec + (tv2.tv_sec * 1000000)) - (tv1.tv_usec + (tv1.tv_sec * 1000000));
 	syslog(LOG_DEBUG, "IMAP command completed in %ld.%ld seconds",
-		(total_time / 1000000),
-		(total_time % 1000000)
-	);
+		    (total_time / 1000000),
+		    (total_time % 1000000)
+		);
 }
 
 void imap_noop (int num_parms, ConstStr *Params)
@@ -1638,7 +1663,7 @@ void imap_logout(int num_parms, ConstStr *Params)
 	if (IMAP->selected) {
 		imap_do_expunge();	/* yes, we auto-expunge at logout */
 	}
-	IAPrintf("* BYE %s logging out\r\n", config.c_fqdn);
+	IAPrintf("* BYE %s logging out\r\n", CtdlGetConfigStr("c_fqdn"));
 	IReply("OK Citadel IMAP session ended.");
 	CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
 	return;
@@ -1647,7 +1672,6 @@ void imap_logout(int num_parms, ConstStr *Params)
 const char *CitadelServiceIMAP="IMAP";
 const char *CitadelServiceIMAPS="IMAPS";
 
-
 /*
  * This function is called to register the IMAP extension with Citadel.
  */
@@ -1703,14 +1727,13 @@ CTDL_MODULE_INIT(imap)
 
 	if (!threading)
 	{
-		CtdlRegisterServiceHook(config.c_imap_port,
+		CtdlRegisterServiceHook(CtdlGetConfigInt("c_imap_port"),
 					NULL, imap_greeting, imap_command_loop, NULL, CitadelServiceIMAP);
 #ifdef HAVE_OPENSSL
-		CtdlRegisterServiceHook(config.c_imaps_port,
+		CtdlRegisterServiceHook(CtdlGetConfigInt("c_imaps_port"),
 					NULL, imaps_greeting, imap_command_loop, NULL, CitadelServiceIMAPS);
 #endif
-		CtdlRegisterSessionHook(imap_cleanup_function, EVT_STOP);
-		CtdlRegisterCleanupHook(imap_cleanup);
+		CtdlRegisterSessionHook(imap_cleanup_function, EVT_STOP, PRIO_STOP + 30);
 	}
 	
 	/* return our module name for the log */