merging git tree

git-svn-id: https://svn.ic-s.nl/svn/dbmail/trunk/dbmail@2484 7b491191-dbf0-0310-aff6-d879d4d69008

Author: paul

ChangeLog

@@ -1,3 +1,45 @@
+2007-03-26  Paul J Stevens <[email protected]>
+
+	* imapcommands.c:
+	fix fallout from imap args cleanup
+	* misc.c:
+	fix minor memleaks (ljackson)
+	* dbmail-imapsession.c, misc.c, test-scripts/testimap.py:
+	integrate and finish patches by AntonZ and LJackson
+
+2007-03-25  Paul J Stevens <[email protected]>
+
+	* check_dbmail_imapd.c, dbmail-imapsession.c, dbmail-imapsession.h, 
+	  imap4.c, imapcommands.c, misc.c:
+	applied patch to fix argument parsing in imap (ljackson) (bug #546)
+	* debug.c, debug.h:
+	cleanup trace calls (closes #532)
+	* db.c:
+	small recent_flag fix
+	* dbmail-imapsession.c, dsn.c, imapd.c, lmtpd.c, pop3d.c, timsieved.c:
+	valgrind fixes (ljackson)
+
+2007-03-24  Aaron Stone  <[email protected]>
+
+	* serverparent.c, dbmailtypes.h, server.c:
+	Fixes to SIGHUP handling (closes bug #546).
+	* dbmail-message.c:
+	Set the tmpfile not to use C library buffering.
+
+2007-03-24  Paul J Stevens <[email protected]>
+
+	* db.c, dbmail-imapsession.c, dm_base64.c, modules/authsql.c:
+	valgrind fixes
+	* check_dbmail_imapd.c, misc.c:
+	fix bug #551
+
+2007-03-23  Aaron Stone  <[email protected]>
+
+	* imapd.c, lmtpd.c, pop3d.c, timsieved.c:
+	Accepted patch from Leif Jackson to formally initialize some variables.
+	* misc.c, serverparent.c:
+	Accepted patch from Leif Jackson to close some minor memory leaks.
+
 2007-03-23  Paul J Stevens <[email protected]>
 
 	* dbmail-imapsession.c, dbmail-imapsession.h, imap4.h:

check_dbmail_imapd.c

@@ -124,13 +124,14 @@ END_TEST
 
 
 #define A(x,y) s=dbmail_imap_astring_as_string(x); \
-	fail_unless(strcmp(y,s)==0,"dbmail_imap_astring_as_string failed"); \
+	fail_unless(strcmp(y,s)==0,"dbmail_imap_astring_as_string failed [%s] != [%s]", s, y); \
 	g_free(s)
 START_TEST(test_dbmail_imap_astring_as_string)
 {
 	char *s;
 	A("test","\"test\"");
 	A("\"test\"","\"test\"");
+	A("\"test\" \"test\"","{13}\r\n\"test\" \"test\"");
 	A("\"test","{5}\r\n\"test");
 	A("testÃ","{5}\r\ntestÃ");
 	A("test\"","{5}\r\ntest\"");
@@ -326,7 +327,8 @@ START_TEST(test_imap_bodyfetch)
 	fail_unless(0 == dbmail_imap_session_bodyfetch_get_last_octetcnt(s), "octetcnt init value incorrect");
 	fail_unless(0 == dbmail_imap_session_bodyfetch_get_last_argstart(s), "argstart init value incorrect");
 
-	dbmail_imap_session_bodyfetch_set_argstart(s,23);
+	s->args_idx = 23;
+	dbmail_imap_session_bodyfetch_set_argstart(s);
 	result = dbmail_imap_session_bodyfetch_get_last_argstart(s);
 	fail_unless(result==23, "argstart incorrect");
 
@@ -486,31 +488,40 @@ START_TEST(test_imap_get_envelope)
 {
 	struct DbmailMessage *message;
 	char *result, *expect;
+	GString *s;
 
 	expect = g_new0(char, 1024);
 
 	/* text/plain */
 	message = dbmail_message_new();
-	message = dbmail_message_init_with_string(message, g_string_new(rfc822));
+	s = g_string_new(rfc822);
+	message = dbmail_message_init_with_string(message, s);
+	g_string_free(s,TRUE);
 	result = imap_get_envelope(GMIME_MESSAGE(message->content));
 	strncpy(expect,"(\"Thu, 01 Jan 1970 00:00:00 +0000\" \"dbmail test message\" ((NIL NIL \"somewher\" \"foo.org\")) ((NIL NIL \"somewher\" \"foo.org\")) ((NIL NIL \"somewher\" \"foo.org\")) ((NIL NIL \"testuser\" \"foo.org\")) NIL NIL NIL NIL)",1024);
 	fail_unless(strncasecmp(result,expect,1024)==0, "imap_get_envelope failed");
 
 	dbmail_message_free(message);
 	g_free(result);
 	result = NULL;
-	g_free(expect);
-	expect = NULL;
 
 	/* bare bones message */
 	message = dbmail_message_new();
-	message = dbmail_message_init_with_string(message, g_string_new(simple));
+	s = g_string_new(simple);
+	message = dbmail_message_init_with_string(message, s);
+	g_string_free(s,TRUE);
 	result = imap_get_envelope(GMIME_MESSAGE(message->content));
 
+	strncpy(expect,"(\"Thu, 01 Jan 1970 00:00:00 +0000\" \"dbmail test message\" NIL NIL NIL NIL NIL NIL NIL NIL)", 1024);
+	fail_unless(strncasecmp(result,expect,1024)==0, "imap_get_envelope failed");
+
 	dbmail_message_free(message);
 	g_free(result);
 	result = NULL;
 
+	g_free(expect);
+	expect = NULL;
+
 }
 END_TEST
 

db.c

@@ -1,3 +1,4 @@
+/* $Id$ */
 /*
   Copyright (C) 1999-2004 IC & S  [email protected]
   Copyright (c) 2005-2006 NFG Net Facilities Group BV [email protected]
@@ -4083,12 +4084,10 @@ int db_get_msgflag(const char *flag_name, u64_t msg_idnr,
 int db_set_msgflag(u64_t msg_idnr, u64_t mailbox_idnr, int *flags, int action_type)
 {
 	size_t i;
-	size_t placed = 0;
 	size_t left;
 	char query[DEF_QUERYSIZE]; 
-	memset(query,0,DEF_QUERYSIZE);
-
 
+	memset(query,0,DEF_QUERYSIZE);
 	snprintf(query, DEF_QUERYSIZE, "UPDATE %smessages SET recent_flag=0,",DBPFX);
 
 	for (i = 0; i < IMAP_NFLAGS; i++) {
@@ -4104,15 +4103,13 @@ int db_set_msgflag(u64_t msg_idnr, u64_t mailbox_idnr, int *flags, int action_ty
 				strncat(query, db_flag_desc[i], left);
 				left = DEF_QUERYSIZE - strlen(query);
 				strncat(query, "=1,", left);
-				placed = 1;
 			}
 			break;
 		case IMAPFA_REMOVE:
 			if (flags[i] > 0) {
 				strncat(query, db_flag_desc[i], left);
 				left = DEF_QUERYSIZE - strlen(query);
 				strncat(query, "=0,", left);
-				placed = 1;
 			}
 			break;
 
@@ -4123,15 +4120,11 @@ int db_set_msgflag(u64_t msg_idnr, u64_t mailbox_idnr, int *flags, int action_ty
 				strncat(query, "=0,", left);
 			else
 				strncat(query, "=1,", left);
-			placed = 1;
 			break;
 		}
 		db_free_result();
 	}
 
-	if (!placed)
-		return DM_SUCCESS;	/* nothing to update */
-
 	/* last character in string is comma, replace it --> strlen()-1 */
 	left = DEF_QUERYSIZE - strlen(query);
 	snprintf(&query[strlen(query) - 1], left,
@@ -4636,8 +4629,9 @@ int db_usermap_resolve(clientinfo_t *ci, const char *username, char *real_userna
 	int result;
 	int score, bestscore = -1;
 	char query[DEF_QUERYSIZE]; 
-	memset(query,0,DEF_QUERYSIZE);
 
+	memset(query,0,DEF_QUERYSIZE);
+	memset(clientsock,0,DM_SOCKADDR_LEN);
 
 	TRACE(TRACE_DEBUG,"checking userid [%s] in usermap", username);