X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fserv_imap.c;h=3d5d2ac7bb8c685ae36235295c0dccf4b4fb15dc;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=f09af1254ecb219d291d687e9d2e38a58d9be12a;hpb=d0a6f3a795db5fb278316acf068019d71845d1fa;p=citadel.git

diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c
index f09af1254..3d5d2ac7b 100644
--- a/citadel/modules/imap/serv_imap.c
+++ b/citadel/modules/imap/serv_imap.c
@@ -2,12 +2,26 @@
  * $Id$ 
  *
  * IMAP server for the Citadel system
- * Copyright (C) 2000-2007 by Art Cancro and others.
+ * Copyright (C) 2000-2009 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
  * is perfect.  Indeed, with so much gratuitous complexity, *all* IMAP
  * implementations have bugs.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  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"
@@ -447,11 +461,20 @@ void imap_output_capability_string(void) {
 
 	/* We are building a partial implementation of METADATA for the sole purpose
 	 * of interoperating with the ical/vcard version of the Bynari Insight Connector.
-	 * If you were expecting something else, comment out one or both of these
-	 * extension advertisements.
+	 * It is not a full RFC5464 implementation, but it should refuse non-Bynari
+	 * metadata in a compatible and graceful way.
 	 */
 	cprintf(" METADATA");
-	/* cprintf(" LIST-EXTENDED"); */
+
+	/*
+	 * LIST-EXTENDED was originally going to be required by the METADATA extension.
+	 * It was mercifully removed prior to the finalization of RFC5464.  We started
+	 * implementing this but stopped when we learned that it would not be needed.
+	 * If you uncomment this declaration you are responsible for writing a lot of new
+	 * code.
+	 *
+	 * cprintf(" LIST-EXTENDED")
+	 */
 }
 
 /*
@@ -593,6 +616,7 @@ void imap_auth_plain(char *cmd)
 	char pass[256];
 	int result;
 
+	memset(pass, 0, sizeof(pass));
 	CtdlDecodeBase64(decoded_authstring, cmd, strlen(cmd));
 	safestrncpy(ident, decoded_authstring, sizeof ident);
 	safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user);
@@ -632,6 +656,7 @@ void imap_auth_login_pass(char *cmd)
 {
 	char buf[SIZ];
 
+	memset(buf, 0, sizeof(buf));
 	CtdlDecodeBase64(buf, cmd, SIZ);
 	if (CtdlTryPassword(buf) == pass_ok) {
 		cprintf("%s OK authentication succeeded\r\n", IMAP->authseq);
@@ -753,7 +778,7 @@ void imap_select(int num_parms, char *parms[])
 	 * 
 	 * Unfortunately, omitting \Deleted as a PERMANENTFLAGS flag causes
 	 * some clients (particularly Thunderbird) to misbehave -- they simply
-	 * electing not to transmit the flag at all.  So we have to advertise
+	 * elect not to transmit the flag at all.  So we have to advertise
 	 * \Deleted as a PERMANENTFLAGS flag, even though it technically isn't.
 	 */
 	cprintf("* FLAGS (\\Deleted \\Seen \\Answered)\r\n");
@@ -889,9 +914,13 @@ void imap_create(int num_parms, char *parms[])
 	int newroomview = 0;
 	char *notification_message = NULL;
 
+	if (num_parms < 3) {
+		cprintf("%s NO A foder name must be specified\r\n", parms[0]);
+		return;
+	}
+
 	if (strchr(parms[2], '\\') != NULL) {
-		cprintf("%s NO Invalid character in folder name\r\n",
-			parms[0]);
+		cprintf("%s NO Invalid character in folder name\r\n", parms[0]);
 		CtdlLogPrintf(CTDL_DEBUG, "invalid character in folder name\n");
 		return;
 	}
@@ -1016,7 +1045,7 @@ void imap_status(int num_parms, char *parms[])
 	char savedroom[ROOMNAMELEN];
 	int msgs, new;
 
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf
 		    ("%s NO Invalid mailbox name or location, or access denied\r\n",
@@ -1118,7 +1147,7 @@ void imap_unsubscribe(int num_parms, char *parms[])
 	char savedroom[ROOMNAMELEN];
 	int msgs, new;
 
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf
 		    ("%s NO Invalid mailbox name or location, or access denied\r\n",
@@ -1632,6 +1661,7 @@ void imap_command_loop(void)
 
 	gettimeofday(&tv2, NULL);
 	total_time = (tv2.tv_usec + (tv2.tv_sec * 1000000)) - (tv1.tv_usec + (tv1.tv_sec * 1000000));
+	CtdlLogPrintf(CTDL_INFO, "IMAP: %s\n", cmdbuf);	// FIXME FIXME FIXME REMOVE THIS NOW
 	CtdlLogPrintf(CTDL_DEBUG, "IMAP command completed in %ld.%ld seconds\n",
 		(total_time / 1000000),
 		(total_time % 1000000)