[Pkg-citadel-commit] r153 - in citadel/trunk/debian: . patches

[dothebart-guest at alioth.debian.org]

Author: dothebart-guest
Date: 2008-09-07 12:41:43 +0000 (Sun, 07 Sep 2008)
New Revision: 153

Added:
   citadel/trunk/debian/patches/r6570_uppercase_smtp_commands.diff
Modified:
   citadel/trunk/debian/changelog
   citadel/trunk/debian/patches/series
Log:
* add r6570_uppercase_smtp_commands.diff patch


Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog	2008-09-07 10:08:32 UTC (rev 152)
+++ citadel/trunk/debian/changelog	2008-09-07 12:41:43 UTC (rev 153)
@@ -1,5 +1,9 @@
 citadel (7.37-5) unstable; urgency=low
 
+  [ Wilfried Goesgens ]
+  * [r6570] add upstream prepatch; uppercase smtp MAIL FROM / RCP TO commands
+
+  [ Michael Meskes ]
   * Added even more manpages.
   * Removed absolute paths in postinst script to make lintian happy.
 

Added: citadel/trunk/debian/patches/r6570_uppercase_smtp_commands.diff
===================================================================
--- citadel/trunk/debian/patches/r6570_uppercase_smtp_commands.diff	                        (rev 0)
+++ citadel/trunk/debian/patches/r6570_uppercase_smtp_commands.diff	2008-09-07 12:41:43 UTC (rev 153)
@@ -0,0 +1,51 @@
+Index: modules/smtp/serv_smtp.c
+===================================================================
+--- modules/smtp/serv_smtp.c	(revision 6569)
++++ modules/smtp/serv_smtp.c	(revision 6570)
+@@ -475,7 +475,7 @@
+ }
+ 
+ /*
+- * Implements the "MAIL From:" command
++ * Implements the "MAIL FROM:" command
+  */
+ void smtp_mail(char *argbuf) {
+ 	char user[SIZ];
+@@ -946,7 +946,7 @@
+ 	CC->redirect_len = 0;
+ 	CC->redirect_alloc = 0;
+ 
+-	/* Extract something to send later in the 'MAIL From:' command */
++	/* Extract something to send later in the 'MAIL FROM:' command */
+ 	strcpy(mailfrom, "");
+ 	scan_done = 0;
+ 	ptr = msgtext;
+@@ -995,7 +995,7 @@
+ 
+ 	/* Figure out what mail exchanger host we have to connect to */
+ 	num_mxhosts = getmx(mxhosts, node);
+-	CtdlLogPrintf(CTDL_DEBUG, "Number of MX hosts for <%s> is %d\n", node, num_mxhosts);
++	CtdlLogPrintf(CTDL_DEBUG, "Number of MX hosts for <%s> is %d [%s]\n", node, num_mxhosts, mxhosts);
+ 	if (num_mxhosts < 1) {
+ 		*status = 5;
+ 		snprintf(dsn, SIZ, "No MX hosts found for <%s>", node);
+@@ -1131,8 +1131,8 @@
+ 		}
+ 	}
+ 
+-	/* previous command succeeded, now try the MAIL From: command */
+-	snprintf(buf, sizeof buf, "MAIL From: <%s>\r\n", mailfrom);
++	/* previous command succeeded, now try the MAIL FROM: command */
++	snprintf(buf, sizeof buf, "MAIL FROM:<%s>\r\n", mailfrom);
+ 	CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
+ 	sock_write(sock, buf, strlen(buf));
+ 	if (ml_sock_gets(sock, buf) < 0) {
+@@ -1155,7 +1155,7 @@
+ 	}
+ 
+ 	/* MAIL succeeded, now try the RCPT To: command */
+-	snprintf(buf, sizeof buf, "RCPT To: <%s@%s>\r\n", user, node);
++	snprintf(buf, sizeof buf, "RCPT TO:<%s@%s>\r\n", user, node);
+ 	CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
+ 	sock_write(sock, buf, strlen(buf));
+ 	if (ml_sock_gets(sock, buf) < 0) {

Modified: citadel/trunk/debian/patches/series
===================================================================
--- citadel/trunk/debian/patches/series	2008-09-07 10:08:32 UTC (rev 152)
+++ citadel/trunk/debian/patches/series	2008-09-07 12:41:43 UTC (rev 153)
@@ -7,3 +7,4 @@
 r6529_no_tmp_files_migrate_aliases.sh.diff
 r6535_autopurger_dont_touch_systemfiles.diff
 r6544_fix_qp_encoder_offbyone.diff
+r6570_uppercase_smtp_commands.diff