Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts from last import.

This commit is contained in:
tron 2011-10-28 07:12:17 +00:00
parent 1613d646d0
commit a1f7ffadc0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/ibm-public/postfix/dist/src/smtpd/smtpd.c vendored
View File

@ -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, int argc, SMTPD_TOKEN *unused_argv)
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;