From fea10f36b3a61ff1300e6e3b587bb881e5a7cf55 Mon Sep 17 00:00:00 2001
From: Wietse Venema <wietse@porcupine.org>
Date: Fri, 2 Sep 2011 00:00:00 -0500
Subject: [PATCH] postfix-2.6.12

---
 postfix/HISTORY                    | 14 ++++++++++++++
 postfix/README_FILES/MILTER_README |  9 ++++++---
 postfix/html/MILTER_README.html    |  5 +++--
 postfix/proto/MILTER_README.html   |  5 +++--
 postfix/src/global/mail_version.h  |  4 ++--
 postfix/src/milter/milter8.c       |  4 +++-
 postfix/src/smtpd/smtpd_state.c    |  1 +
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 833a4c119..5de54b1db 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -15527,3 +15527,17 @@ Apologies for any names omitted.
 	IP queries" even if the name has an alphanumerical prefix.
 	We play safe, and skip RHSBL queries for names ending in a
 	numerical suffix.  File: smtpd/smtpd_check.c.
+
+20110811
+
+	Workaround: report a {client_connections} Milter macro value
+	of zero instead of garbage, when the remote SMTP client is
+	not subject to any smtpd_client_* limits. Problem reported
+	by Christian Roessner. File: smtpd/smtpd_state.c,
+	proto/MILTER_README.html.
+
+20110831
+
+	Bugfix: allow for Milters that send an SMTP server reply
+	without RFC 3463 enhanced status code. Reported by Vladimir
+	Vassiliev.  File: milter/milter8.c.
diff --git a/postfix/README_FILES/MILTER_README b/postfix/README_FILES/MILTER_README
index 5dceb11e6..3b0eb1c46 100644
--- a/postfix/README_FILES/MILTER_README
+++ b/postfix/README_FILES/MILTER_README
@@ -337,8 +337,11 @@ Sendmail. See the workarounds section below for solutions.
     |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
     |{client_addr}       |Always                   |Client IP address         |
     |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
-    |{client_connections}|CONNECT                  |Connection concurrency for|
-    |                    |                         |this client               |
+    |                    |                         |Connection concurrency for|
+    |                    |                         |this client (zero if the  |
+    |{client_connections}|CONNECT                  |client is excluded from   |
+    |                    |                         |all smtpd_client_*        |
+    |                    |                         |limits).                  |
     |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
     |                    |                         |Client hostname           |
     |                    |                         |When address -> name      |
@@ -468,7 +471,7 @@ WWoorrkkaarroouunnddss
     queue ID in the message header.
 
     To fix the ugly message header, you will need to add code that looks up the
-    Postfix queue ID at some later point im time. The example below adds the
+    Postfix queue ID at some later point in time. The example below adds the
     lookup after the end-of-message.
 
       o Edit the filter source file (typically named xxx-filter/xxx-filter.c or
diff --git a/postfix/html/MILTER_README.html b/postfix/html/MILTER_README.html
index 5aa69c06d..de9eb968e 100644
--- a/postfix/html/MILTER_README.html
+++ b/postfix/html/MILTER_README.html
@@ -556,7 +556,8 @@ login method </td> </tr>
 address </td> </tr>
 
 <tr> <td> {client_connections} </td> <td> CONNECT </td> <td>
-Connection concurrency for this client </td> </tr>
+Connection concurrency for this client (zero if the client is
+excluded from all smtpd_client_* limits). </td> </tr>
 
 <tr> <td> {client_name} </td> <td> Always </td> <td> Client hostname
 <br> When address &rarr; name lookup or name &rarr; address
@@ -718,7 +719,7 @@ version 1.0.0 no longer includes the queue ID in the message header.
 </p>
 
 <p> To fix the ugly message header, you will need to add code that
-looks up the Postfix queue ID at some later point im time. The
+looks up the Postfix queue ID at some later point in time. The
 example below adds the lookup after the end-of-message.  </p>
 
 <ul>
diff --git a/postfix/proto/MILTER_README.html b/postfix/proto/MILTER_README.html
index 41f6938c3..afa2ba999 100644
--- a/postfix/proto/MILTER_README.html
+++ b/postfix/proto/MILTER_README.html
@@ -556,7 +556,8 @@ login method </td> </tr>
 address </td> </tr>
 
 <tr> <td> {client_connections} </td> <td> CONNECT </td> <td>
-Connection concurrency for this client </td> </tr>
+Connection concurrency for this client (zero if the client is
+excluded from all smtpd_client_* limits). </td> </tr>
 
 <tr> <td> {client_name} </td> <td> Always </td> <td> Client hostname
 <br> When address &rarr; name lookup or name &rarr; address
@@ -718,7 +719,7 @@ version 1.0.0 no longer includes the queue ID in the message header.
 </p>
 
 <p> To fix the ugly message header, you will need to add code that
-looks up the Postfix queue ID at some later point im time. The
+looks up the Postfix queue ID at some later point in time. The
 example below adds the lookup after the end-of-message.  </p>
 
 <ul>
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index c7f7788b7..06834b47a 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20110707"
-#define MAIL_VERSION_NUMBER	"2.6.11"
+#define MAIL_RELEASE_DATE	"20110902"
+#define MAIL_VERSION_NUMBER	"2.6.12"
 
 #ifdef SNAPSHOT
 # define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
diff --git a/postfix/src/milter/milter8.c b/postfix/src/milter/milter8.c
index 21776ca8d..7053ba133 100644
--- a/postfix/src/milter/milter8.c
+++ b/postfix/src/milter/milter8.c
@@ -1252,11 +1252,13 @@ static const char *milter8_event(MILTER8 *milter, int event,
 				  MILTER8_DATA_BUFFER, milter->buf,
 				  MILTER8_DATA_END) != 0)
 		MILTER8_EVENT_BREAK(milter->def_reply);
+	    /* XXX Enforce this for each line of a multi-line reply. */
 	    if ((STR(milter->buf)[0] != '4' && STR(milter->buf)[0] != '5')
 		|| !ISDIGIT(STR(milter->buf)[1])
 		|| !ISDIGIT(STR(milter->buf)[2])
 		|| (STR(milter->buf)[3] != ' ' && STR(milter->buf)[3] != '-')
-		|| STR(milter->buf)[4] != STR(milter->buf)[0]) {
+		|| (ISDIGIT(STR(milter->buf)[4])
+		    && (STR(milter->buf)[4] != STR(milter->buf)[0]))) {
 		msg_warn("milter %s: malformed reply: %s",
 			 milter->m.name, STR(milter->buf));
 		milter8_conf_error(milter);
diff --git a/postfix/src/smtpd/smtpd_state.c b/postfix/src/smtpd/smtpd_state.c
index 5ecf2d1f2..ec07da4bb 100644
--- a/postfix/src/smtpd/smtpd_state.c
+++ b/postfix/src/smtpd/smtpd_state.c
@@ -84,6 +84,7 @@ void    smtpd_state_init(SMTPD_STATE *state, VSTREAM *stream,
     state->service = mystrdup(service);
     state->buffer = vstring_alloc(100);
     state->addr_buf = vstring_alloc(100);
+    state->conn_count = state->conn_rate = 0;
     state->error_count = 0;
     state->error_mask = 0;
     state->notify_mask = name_mask(VAR_NOTIFY_CLASSES, mail_error_masks,