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

postfix-2.0.16-20031223
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 4be4a4853..edaedd257 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -8901,11 +8901,24 @@ Apologies for any names omitted.
 	duplicate address filter footprint. After discussion with
 	Victor Duchovni. File: cleanup/cleanup_out_recipient.c.
 
+	Safety: added "mail loops to myself" logic for destinations
+	that don't have an MX host.  File: smtp/smtp_addr.c.
+
+20031223
+
+	Workaround: turn off "mail loops to myself" for non-MX
+	destinations because it breaks SMTP-based content filters.
+	Fix is to turn off loop detection when a non-default TCP
+	port is specified.  File: smtp/smtp_addr.c.
+
 Open problems:
 
 	Low: in the SMTP client, pass the session, request and
 	state structures as separate arguments.
 
+	Low: in the SMTP client, turn off "mail loops back to
+	myself" detection if a non-default TCP port is specified.
+
 	High: when virtual aliasing is turned off after content
 	filtering, local submissions may escape virtual aliasing.
 
diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES
index 56328ca31..1b10ccf82 100644
--- a/postfix/RELEASE_NOTES
+++ b/postfix/RELEASE_NOTES
@@ -22,7 +22,7 @@ snapshot release).  Patches change the patchlevel and the release
 date. Snapshots change only the release date, unless they include
 the same bugfixes as a patch release.
 
-Incompatible changes with Postfix snapshot 2.0.16-20031222
+Incompatible changes with Postfix snapshot 2.0.16-20031223
 ==========================================================
 
 In mailq (queue listing) output, there no longer is space between
@@ -37,7 +37,7 @@ get the old behavior, specify "smtp_mx_session_limit = 1" in main.cf.
 After delivery failure due to a temporary error condition, the SMTP
 client now always connects to the fall-back relay if specified.
 
-Major changes with Postfix snapshot 2.0.16-20031222
+Major changes with Postfix snapshot 2.0.16-20031223
 ===================================================
 
 The SMTP client now tries to connect to an alternate MX address
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 44a4fbf6e..b56b2e540 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	"20031222"
+#define MAIL_RELEASE_DATE	"20031223"
 
 #define VAR_MAIL_VERSION	"mail_version"
 #define DEF_MAIL_VERSION	"2.0.16-" MAIL_RELEASE_DATE
diff --git a/postfix/src/smtp/smtp_addr.c b/postfix/src/smtp/smtp_addr.c
index 54c90ea6c..adaf01d8f 100644
--- a/postfix/src/smtp/smtp_addr.c
+++ b/postfix/src/smtp/smtp_addr.c
@@ -463,12 +463,14 @@ DNS_RR *smtp_host_addr(char *host, VSTRING *why)
      */
 #define PREF0	0
     addr_list = smtp_addr_one((DNS_RR *) 0, host, PREF0, why);
+#if 0
     if (addr_list && smtp_find_self(addr_list) != 0) {
 	dns_rr_free(addr_list);
 	vstring_sprintf(why, "mail for %s loops back to myself", host);
 	smtp_errno = SMTP_LOOP;
 	return (0);
     }
+#endif
     if (addr_list && addr_list->next && var_smtp_rand_addr)
 	addr_list = dns_rr_shuffle(addr_list);
     if (msg_verbose)