Module Name: src
Committed By: bouyer
Date: Sat Sep 17 18:57:34 UTC 2011
Modified Files:
src/external/ibm-public/postfix/dist [netbsd-5]: HISTORY
src/external/ibm-public/postfix/dist/README_FILES [netbsd-5]:
MILTER_README
src/external/ibm-public/postfix/dist/html [netbsd-5]:
MILTER_README.html
src/external/ibm-public/postfix/dist/proto [netbsd-5]:
MILTER_README.html
src/external/ibm-public/postfix/dist/src/global [netbsd-5]:
mail_version.h
src/external/ibm-public/postfix/dist/src/milter [netbsd-5]: milter8.c
src/external/ibm-public/postfix/dist/src/smtpd [netbsd-5]:
smtpd_state.c
Log Message:
Apply patch, requested by tron in ticket #1669:
external/ibm-public/postfix/dist/HISTORY patch
external/ibm-public/postfix/dist/README_FILES/MILTER_README patch
external/ibm-public/postfix/dist/html/MILTER_README.html patch
external/ibm-public/postfix/dist/proto/MILTER_README.html patch
external/ibm-public/postfix/dist/src/global/mail_version.h patch
external/ibm-public/postfix/dist/src/milter/milter8.c patch
external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c patch
Update Postfix to version 2.7.6. Changes since version 2.7.5:
- The Postfix Milter client logged a "milter miltername: malformed
reply" error when a Milter sent an SMTP response without enhanced
status code (i.e. "XXX Text" instead of "XXX X.X.X Text").
- The Postfix Milter client sent a random {client_connections} macro
value when the remote SMTP client was not subject to any
smtpd_client_* limit. As a workaround, it now sends a zero value
instead.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.2.7 -r1.1.1.2.2.8 \
src/external/ibm-public/postfix/dist/HISTORY
cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \
src/external/ibm-public/postfix/dist/README_FILES/MILTER_README
cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \
src/external/ibm-public/postfix/dist/html/MILTER_README.html
cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \
src/external/ibm-public/postfix/dist/proto/MILTER_README.html
cvs rdiff -u -r1.1.1.2.2.7 -r1.1.1.2.2.8 \
src/external/ibm-public/postfix/dist/src/global/mail_version.h
cvs rdiff -u -r1.1.1.2.2.5 -r1.1.1.2.2.6 \
src/external/ibm-public/postfix/dist/src/milter/milter8.c
cvs rdiff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5 \
src/external/ibm-public/postfix/dist/src/smtpd/smtpd_state.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/HISTORY
diff -u src/external/ibm-public/postfix/dist/HISTORY:1.1.1.2.2.7 src/external/ibm-public/postfix/dist/HISTORY:1.1.1.2.2.8
--- src/external/ibm-public/postfix/dist/HISTORY:1.1.1.2.2.7 Tue Aug 9 18:58:15 2011
+++ src/external/ibm-public/postfix/dist/HISTORY Sat Sep 17 18:57:32 2011
@@ -15942,3 +15942,17 @@
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.
Index: src/external/ibm-public/postfix/dist/README_FILES/MILTER_README
diff -u src/external/ibm-public/postfix/dist/README_FILES/MILTER_README:1.1.1.1.2.3 src/external/ibm-public/postfix/dist/README_FILES/MILTER_README:1.1.1.1.2.4
--- src/external/ibm-public/postfix/dist/README_FILES/MILTER_README:1.1.1.1.2.3 Sun Nov 21 18:31:23 2010
+++ src/external/ibm-public/postfix/dist/README_FILES/MILTER_README Sat Sep 17 18:57:33 2011
@@ -337,8 +337,11 @@
|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
|{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 |
Index: src/external/ibm-public/postfix/dist/html/MILTER_README.html
diff -u src/external/ibm-public/postfix/dist/html/MILTER_README.html:1.1.1.1.2.3 src/external/ibm-public/postfix/dist/html/MILTER_README.html:1.1.1.1.2.4
--- src/external/ibm-public/postfix/dist/html/MILTER_README.html:1.1.1.1.2.3 Sun Nov 21 18:31:23 2010
+++ src/external/ibm-public/postfix/dist/html/MILTER_README.html Sat Sep 17 18:57:33 2011
@@ -556,7 +556,8 @@
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 → name lookup or name → address
Index: src/external/ibm-public/postfix/dist/proto/MILTER_README.html
diff -u src/external/ibm-public/postfix/dist/proto/MILTER_README.html:1.1.1.1.2.3 src/external/ibm-public/postfix/dist/proto/MILTER_README.html:1.1.1.1.2.4
--- src/external/ibm-public/postfix/dist/proto/MILTER_README.html:1.1.1.1.2.3 Sun Nov 21 18:31:27 2010
+++ src/external/ibm-public/postfix/dist/proto/MILTER_README.html Sat Sep 17 18:57:34 2011
@@ -556,7 +556,8 @@
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 → name lookup or name → address
Index: src/external/ibm-public/postfix/dist/src/global/mail_version.h
diff -u src/external/ibm-public/postfix/dist/src/global/mail_version.h:1.1.1.2.2.7 src/external/ibm-public/postfix/dist/src/global/mail_version.h:1.1.1.2.2.8
--- src/external/ibm-public/postfix/dist/src/global/mail_version.h:1.1.1.2.2.7 Tue Aug 9 18:58:16 2011
+++ src/external/ibm-public/postfix/dist/src/global/mail_version.h Sat Sep 17 18:57:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mail_version.h,v 1.1.1.2.2.7 2011/08/09 18:58:16 riz Exp $ */
+/* $NetBSD: mail_version.h,v 1.1.1.2.2.8 2011/09/17 18:57:34 bouyer Exp $ */
#ifndef _MAIL_VERSION_H_INCLUDED_
#define _MAIL_VERSION_H_INCLUDED_
@@ -22,8 +22,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.7.5"
+#define MAIL_RELEASE_DATE "20110902"
+#define MAIL_VERSION_NUMBER "2.7.6"
#ifdef SNAPSHOT
# define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE
Index: src/external/ibm-public/postfix/dist/src/milter/milter8.c
diff -u src/external/ibm-public/postfix/dist/src/milter/milter8.c:1.1.1.2.2.5 src/external/ibm-public/postfix/dist/src/milter/milter8.c:1.1.1.2.2.6
--- src/external/ibm-public/postfix/dist/src/milter/milter8.c:1.1.1.2.2.5 Tue Aug 9 18:58:17 2011
+++ src/external/ibm-public/postfix/dist/src/milter/milter8.c Sat Sep 17 18:57:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: milter8.c,v 1.1.1.2.2.5 2011/08/09 18:58:17 riz Exp $ */
+/* $NetBSD: milter8.c,v 1.1.1.2.2.6 2011/09/17 18:57:34 bouyer Exp $ */
/*++
/* NAME
@@ -1254,11 +1254,13 @@
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);
Index: src/external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c
diff -u src/external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c:1.1.1.1.2.4 src/external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c:1.1.1.1.2.5
--- src/external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c:1.1.1.1.2.4 Fri Jan 7 01:24:14 2011
+++ src/external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c Sat Sep 17 18:57:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smtpd_state.c,v 1.1.1.1.2.4 2011/01/07 01:24:14 riz Exp $ */
+/* $NetBSD: smtpd_state.c,v 1.1.1.1.2.5 2011/09/17 18:57:34 bouyer Exp $ */
/*++
/* NAME
@@ -86,6 +86,7 @@
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,
