summaryrefslogtreecommitdiff
path: root/external/ibm-public
diff options
context:
space:
mode:
authortron <tron@NetBSD.org>2015-01-24 18:10:52 +0000
committertron <tron@NetBSD.org>2015-01-24 18:10:52 +0000
commite7f0f37e8e27321c7864e4158ba8d19fe23a91c3 (patch)
tree8f9272b9d13494b6225c58359c484419ac320a66 /external/ibm-public
parent4c550879c2377bec13f17df8a7ba898362735e19 (diff)
Resolve conflicts from last import.
Diffstat (limited to 'external/ibm-public')
-rw-r--r--external/ibm-public/postfix/dist/makedefs4
-rw-r--r--external/ibm-public/postfix/dist/src/cleanup/cleanup.h3
-rw-r--r--external/ibm-public/postfix/dist/src/smtpd/smtpd.c5
3 files changed, 7 insertions, 5 deletions
diff --git a/external/ibm-public/postfix/dist/makedefs b/external/ibm-public/postfix/dist/makedefs
index dd5f2564ee2..d68fa6cc5a6 100644
--- a/external/ibm-public/postfix/dist/makedefs
+++ b/external/ibm-public/postfix/dist/makedefs
@@ -491,9 +491,9 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
?.*) 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).
diff --git a/external/ibm-public/postfix/dist/src/cleanup/cleanup.h b/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
index 03a4d27cc7d..28647d1d335 100644
--- a/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
+++ b/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
@@ -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 */
diff --git a/external/ibm-public/postfix/dist/src/smtpd/smtpd.c b/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
index bf12aff99cf..bf00b2d6e6d 100644
--- a/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
+++ b/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
@@ -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, int argc, SMTPD_TOKEN *unused_argv)
}
/*
- * 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, int argc, SMTPD_TOKEN *unused_argv)
"\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;