[src/trunk]: src/external/ibm-public/postfix/dist/src/smtpd Resolve conflicts...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/721754b0db5f
branches:  trunk
changeset: 770660:721754b0db5f
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Oct 28 07:12:17 2011 +0000

description:
Resolve conflicts from last import.

diffstat:

 external/ibm-public/postfix/dist/src/smtpd/smtpd.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r d1b272dcd103 -r 721754b0db5f external/ibm-public/postfix/dist/src/smtpd/smtpd.c
--- a/external/ibm-public/postfix/dist/src/smtpd/smtpd.c        Fri Oct 28 07:08:57 2011 +0000
+++ b/external/ibm-public/postfix/dist/src/smtpd/smtpd.c        Fri Oct 28 07:12:17 2011 +0000
@@ -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 @@
        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;