Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/ibm-public/postfix/dist Import Postfix version 2.8....
details: https://anonhg.NetBSD.org/src/rev/950f6e82849f
branches: trunk
changeset: 769440:950f6e82849f
user: tron <tron%NetBSD.org@localhost>
date: Sat Sep 10 10:35:21 2011 +0000
description:
Import Postfix version 2.8.5. Changes since version 2.8.4:
- 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.
diffstat:
external/ibm-public/postfix/dist/HISTORY | 14 +++++++++++++
external/ibm-public/postfix/dist/README_FILES/MILTER_README | 7 ++++-
external/ibm-public/postfix/dist/html/MILTER_README.html | 3 +-
external/ibm-public/postfix/dist/proto/MILTER_README.html | 3 +-
external/ibm-public/postfix/dist/src/global/mail_version.h | 6 ++--
external/ibm-public/postfix/dist/src/milter/milter8.c | 6 +++-
external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c | 3 +-
7 files changed, 32 insertions(+), 10 deletions(-)
diffs (125 lines):
diff -r 356251b39a80 -r 950f6e82849f external/ibm-public/postfix/dist/HISTORY
--- a/external/ibm-public/postfix/dist/HISTORY Sat Sep 10 10:29:39 2011 +0000
+++ b/external/ibm-public/postfix/dist/HISTORY Sat Sep 10 10:35:21 2011 +0000
@@ -16634,3 +16634,17 @@
IP queries" even if the name has an alphanumerical prefix.
We play safe, and skip both RHSBL and RHSWL 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 -r 356251b39a80 -r 950f6e82849f external/ibm-public/postfix/dist/README_FILES/MILTER_README
--- a/external/ibm-public/postfix/dist/README_FILES/MILTER_README Sat Sep 10 10:29:39 2011 +0000
+++ b/external/ibm-public/postfix/dist/README_FILES/MILTER_README Sat Sep 10 10:35:21 2011 +0000
@@ -339,8 +339,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 |
diff -r 356251b39a80 -r 950f6e82849f external/ibm-public/postfix/dist/html/MILTER_README.html
--- a/external/ibm-public/postfix/dist/html/MILTER_README.html Sat Sep 10 10:29:39 2011 +0000
+++ b/external/ibm-public/postfix/dist/html/MILTER_README.html Sat Sep 10 10:35:21 2011 +0000
@@ -559,7 +559,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
diff -r 356251b39a80 -r 950f6e82849f external/ibm-public/postfix/dist/proto/MILTER_README.html
--- a/external/ibm-public/postfix/dist/proto/MILTER_README.html Sat Sep 10 10:29:39 2011 +0000
+++ b/external/ibm-public/postfix/dist/proto/MILTER_README.html Sat Sep 10 10:35:21 2011 +0000
@@ -559,7 +559,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
diff -r 356251b39a80 -r 950f6e82849f external/ibm-public/postfix/dist/src/global/mail_version.h
--- a/external/ibm-public/postfix/dist/src/global/mail_version.h Sat Sep 10 10:29:39 2011 +0000
+++ b/external/ibm-public/postfix/dist/src/global/mail_version.h Sat Sep 10 10:35:21 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mail_version.h,v 1.1.1.9 2011/07/31 10:02:38 tron Exp $ */
+/* $NetBSD: mail_version.h,v 1.1.1.10 2011/09/10 10:36:12 tron 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 "20110706"
-#define MAIL_VERSION_NUMBER "2.8.4"
+#define MAIL_RELEASE_DATE "20110902"
+#define MAIL_VERSION_NUMBER "2.8.5"
#ifdef SNAPSHOT
# define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE
diff -r 356251b39a80 -r 950f6e82849f external/ibm-public/postfix/dist/src/milter/milter8.c
--- a/external/ibm-public/postfix/dist/src/milter/milter8.c Sat Sep 10 10:29:39 2011 +0000
+++ b/external/ibm-public/postfix/dist/src/milter/milter8.c Sat Sep 10 10:35:21 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: milter8.c,v 1.1.1.5 2011/07/31 10:02:43 tron Exp $ */
+/* $NetBSD: milter8.c,v 1.1.1.6 2011/09/10 10:36:18 tron Exp $ */
/*++
/* NAME
@@ -1257,11 +1257,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);
diff -r 356251b39a80 -r 950f6e82849f external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c
--- a/external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c Sat Sep 10 10:29:39 2011 +0000
+++ b/external/ibm-public/postfix/dist/src/smtpd/smtpd_state.c Sat Sep 10 10:35:21 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: smtpd_state.c,v 1.1.1.3 2011/03/02 19:32:38 tron Exp $ */
+/* $NetBSD: smtpd_state.c,v 1.1.1.4 2011/09/10 10:36:31 tron 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,
Home |
Main Index |
Thread Index |
Old Index