Module Name: src
Committed By: tron
Date: Sat Jan 24 18:10:52 UTC 2015
Modified Files:
src/external/ibm-public/postfix/dist: makedefs
src/external/ibm-public/postfix/dist/src/cleanup: cleanup.h
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.9 -r1.10 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
cvs rdiff -u -r1.11 -r1.12 \
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/makedefs
diff -u src/external/ibm-public/postfix/dist/makedefs:1.9 src/external/ibm-public/postfix/dist/makedefs:1.10
--- src/external/ibm-public/postfix/dist/makedefs:1.9 Sun Jul 6 19:45:50 2014
+++ src/external/ibm-public/postfix/dist/makedefs Sat Jan 24 18:10:52 2015
@@ -491,9 +491,9 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
?.*) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_NAMESER8_COMPAT_H";;
*) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_ARPA_NAMESER_COMPAT_H";;
esac
- # Darwin 12.x (MacOS X 10.8.x), maybe earlier, needs libresolv.
+ # Darwin 11.x (MacOS X 10.7.x), maybe earlier, needs libresolv.
case $RELEASE in
- ?.*|1[0-1].*) ;;
+ ?.*|10.*) ;;
*) SYSLIBS="$SYSLIBS -lresolv";;
esac
# kqueue and/or poll are broken in MacOS X 10.5 (Darwin 9).
Index: src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
diff -u src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h:1.6 src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h:1.7
--- src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h:1.6 Sun Jul 6 19:45:50 2014
+++ src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h Sat Jan 24 18:10:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cleanup.h,v 1.6 2014/07/06 19:45:50 tron Exp $ */
+/* $NetBSD: cleanup.h,v 1.7 2015/01/24 18:10:52 tron Exp $ */
/*++
/* NAME
@@ -63,6 +63,7 @@ typedef struct CLEANUP_STATE {
char *orig_rcpt; /* original recipient address */
char *return_receipt; /* return-receipt address */
char *errors_to; /* errors-to address */
+ ARGV *auto_hdrs; /* MTA's own header(s) */
int flags; /* processing options, status flags */
int qmgr_opts; /* qmgr processing options */
int errs; /* any badness experienced */
Index: src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
diff -u src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.11 src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.12
--- src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1.11 Sun Jul 6 19:45:50 2014
+++ src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c Sat Jan 24 18:10:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: smtpd.c,v 1.11 2014/07/06 19:45:50 tron Exp $ */
+/* $NetBSD: smtpd.c,v 1.12 2015/01/24 18:10:52 tron Exp $ */
/*++
/* NAME
@@ -2987,7 +2987,7 @@ static int data_cmd(SMTPD_STATE *state,
}
/*
- * PREPEND message headers.
+ * PREPEND message headers above our own Received: header.
*/
if (state->prepend)
for (cpp = state->prepend->argv; *cpp; cpp++)
@@ -3082,6 +3082,7 @@ static int data_cmd(SMTPD_STATE *state,
"\t(envelope-from %s)", STR(state->buffer));
#endif
}
+
smtpd_chat_reply(state, "354 End data with <CR><LF>.<CR><LF>");
state->where = SMTPD_AFTER_DATA;
