From: Wietse Venema <wietse@porcupine.org>
Date: Sun, 7 Dec 2003 05:00:00 +0000 (-0500)
Subject: postfix-2.0.16-20031207
X-Git-Tag: v2.1-RC1-20040331~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ad69335e7ae24ad747ff467614907a18f1a3d58;p=thirdparty%2Fpostfix.git

postfix-2.0.16-20031207
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 483a03b85..d11a0b4ae 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -8812,6 +8812,11 @@ Apologies for any names omitted.
 	Minor cleanups of the xclient error messages; xclient
 	command lookup tables. File: smtpd/smtpd.c.
 
+20031207
+
+	Bugfix: fallback_transport and mailbox_transport were broken
+	because the deliver_pass.c module was not updated for the
+	changed message delivery protocol.
 Open problems:
 
 	High: when virtual aliasing is turned off after content
diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES
index 9203c376c..23af8f6b4 100644
--- a/postfix/RELEASE_NOTES
+++ b/postfix/RELEASE_NOTES
@@ -1,6 +1,9 @@
 ===============================================================
 WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 ===============================================================
+The XCLIENT feature for content filter logging is still changing
+and the design details have already changed again.
+
 The sender/recipient address verification code is lightly documented
 and has been tested lightly. The code is proof-of-concept quality
 and must not be used on high-volume sites.  Use at your own risk.
diff --git a/postfix/src/global/deliver_pass.c b/postfix/src/global/deliver_pass.c
index df4c8608f..4eabb3673 100644
--- a/postfix/src/global/deliver_pass.c
+++ b/postfix/src/global/deliver_pass.c
@@ -107,6 +107,10 @@ static int deliver_pass_send_request(VSTREAM *stream, DELIVER_REQUEST *request,
 	       ATTR_TYPE_STR, MAIL_ATTR_ERRTO, request->errors_to,
 	       ATTR_TYPE_STR, MAIL_ATTR_RRCPT, request->return_receipt,
 	       ATTR_TYPE_LONG, MAIL_ATTR_TIME, request->arrival_time,
+	       ATTR_TYPE_STR, MAIL_ATTR_CLIENT_NAME, request->client_name,
+	       ATTR_TYPE_STR, MAIL_ATTR_CLIENT_ADDR, request->client_addr,
+	       ATTR_TYPE_STR, MAIL_ATTR_PROTO_NAME, request->client_proto,
+	       ATTR_TYPE_STR, MAIL_ATTR_HELO_NAME, request->client_helo,
 	       ATTR_TYPE_LONG, MAIL_ATTR_OFFSET, offs,
 	       ATTR_TYPE_STR, MAIL_ATTR_ORCPT, orcpt,
 	       ATTR_TYPE_STR, MAIL_ATTR_RECIP, addr,
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index f47afcf29..acb4ee8bc 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only, unless they include the same bugfix as a patch release.
   */
-#define MAIL_RELEASE_DATE	"20031204"
+#define MAIL_RELEASE_DATE	"20031207"
 
 #define VAR_MAIL_VERSION	"mail_version"
 #define DEF_MAIL_VERSION	"2.0.16-" MAIL_RELEASE_DATE