Module Name: src
Committed By: tron
Date: Fri Oct 28 07:12:17 UTC 2011
Modified Files:
src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
diff -u src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.6 src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.7
--- src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.6 Wed Mar 2 19:56:39 2011
+++ src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c Fri Oct 28 07:12:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smtpd.c,v 1.6 2011/03/02 19:56:39 tron Exp $ */
+/* $NetBSD: smtpd.c,v 1.7 2011/10/28 07:12:17 tron Exp $ */
/*++
/* NAME
@@ -3042,6 +3042,7 @@ static int data_cmd(SMTPD_STATE *state,
if (state->err == 0) {
why = vstring_alloc(10);
state->err = mail_stream_finish(state->dest, why);
+ printable(STR(why), ' ');
} else
mail_stream_cleanup(state->dest);
state->dest = 0;
