From: Wietse Venema
Date: Thu, 30 Dec 2004 05:00:00 +0000 (-0500)
Subject: postfix-2.2-20041230
X-Git-Tag: v2.2.0-RC1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56e972e7c4a01b1d3b31a77637230c2dc8cfbce4;p=thirdparty%2Fpostfix.git
postfix-2.2-20041230
---
diff --git a/postfix/HISTORY b/postfix/HISTORY
index 89ad8b421..eef5f5c67 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -9993,6 +9993,13 @@ Apologies for any names omitted.
Bugfix: further postcat corner cases.
+20041228
+
+ Bugfix: SMTPD_PROXY_README incorrectly claimed that ":port"
+ in master.cf causes a server to listen only on "localhost"
+ without exposing the service to the network. Instead,
+ ":port" causes a client to connect to "localhost".
+
Open problems:
Med: implement ${name[?:]value} in main.cf or update the
diff --git a/postfix/README_FILES/SMTPD_PROXY_README b/postfix/README_FILES/SMTPD_PROXY_README
index 812569931..54e4fc938 100644
--- a/postfix/README_FILES/SMTPD_PROXY_README
+++ b/postfix/README_FILES/SMTPD_PROXY_README
@@ -111,7 +111,7 @@ This is configured by editing the master.cf file:
# After-filter SMTP server. Receive mail from the content filter
# on localhost port 10026.
#
- :10026 inet n - n - - smtpd
+ 127.0.0.1:10026 inet n - n - - smtpd
-o smtpd_authorized_xforward_hosts=127.0.0.0/8
-o smtpd_client_restrictions=
-o smtpd_helo_restrictions=
@@ -145,9 +145,9 @@ master.cf file:
The after-filter SMTP server is a new master.cf entry:
- * The ":10026" makes the after-filter SMTP server listen on the localhost
- address only, without exposing it to the network. NEVER expose the after-
- filter SMTP server to the Internet :-)
+ * The "127.0.0.1:10026" makes the after-filter SMTP server listen on the
+ localhost address only, without exposing it to the network. NEVER expose
+ the after-filter SMTP server to the Internet :-)
* The "-o smtpd_authorized_xforward_hosts=127.0.0.0/8" allows the after-
filter SMTP server to receive remote SMTP client information from the
@@ -168,8 +168,8 @@ CCoonnffiigguurraattiioonn ppaarraammeetteerrss
Parameters that control proxying:
* smtpd_proxy_filter (syntax: host:port): The host and TCP port of the
- before-queue content filter. When no host or host: is specified, localhost
- is assumed.
+ before-queue content filter. When no host or host: is specified here,
+ localhost is assumed.
* smtpd_proxy_timeout (default: 100s): Timeout for connecting to the before-
queue content filter and for sending and receiving commands and data. All
diff --git a/postfix/html/SMTPD_PROXY_README.html b/postfix/html/SMTPD_PROXY_README.html
index 3004232ee..5b85b1959 100644
--- a/postfix/html/SMTPD_PROXY_README.html
+++ b/postfix/html/SMTPD_PROXY_README.html
@@ -240,7 +240,7 @@ PERL/SMTP content filtering framework. See:
# After-filter SMTP server. Receive mail from the content filter
# on localhost port 10026.
#
- :10026 inet n - n - - smtpd
+ 127.0.0.1:10026 inet n - n - - smtpd
-o smtpd_authorized_xforward_hosts=127.0.0.0/8
-o smtpd_client_restrictions=
-o smtpd_helo_restrictions=
@@ -283,7 +283,8 @@ the top of the master.cf file:
- -
The ":10026" makes the after-filter SMTP server listen
+
-
The "127.0.0.1:10026" makes the after-filter SMTP
+ server listen
on the localhost address only, without exposing it to the
network. NEVER expose the after-filter SMTP server to the
Internet :-)
@@ -314,7 +315,7 @@ can't control when the remote SMTP client times out.
-
smtpd_proxy_filter (syntax: host:port): The host and TCP
port of the before-queue content filter. When no host or host:
-is specified, localhost is assumed.
+is specified here, localhost is assumed.
-
smtpd_proxy_timeout (default: 100s): Timeout for connecting
to the before-queue content filter and for sending and receiving
diff --git a/postfix/proto/SMTPD_PROXY_README.html b/postfix/proto/SMTPD_PROXY_README.html
index a9b21ddea..7a39abe3e 100644
--- a/postfix/proto/SMTPD_PROXY_README.html
+++ b/postfix/proto/SMTPD_PROXY_README.html
@@ -240,7 +240,7 @@ http://bent.latency.net/smtpprox/.
# After-filter SMTP server. Receive mail from the content filter
# on localhost port 10026.
#
- :10026 inet n - n - - smtpd
+ 127.0.0.1:10026 inet n - n - - smtpd
-o smtpd_authorized_xforward_hosts=127.0.0.0/8
-o smtpd_client_restrictions=
-o smtpd_helo_restrictions=
@@ -283,7 +283,8 @@ the top of the master.cf file:
- -
The ":10026" makes the after-filter SMTP server listen
+
-
The "127.0.0.1:10026" makes the after-filter SMTP
+ server listen
on the localhost address only, without exposing it to the
network. NEVER expose the after-filter SMTP server to the
Internet :-)
@@ -314,7 +315,7 @@ can't control when the remote SMTP client times out.
-
smtpd_proxy_filter (syntax: host:port): The host and TCP
port of the before-queue content filter. When no host or host:
-is specified, localhost is assumed.
+is specified in client context, localhost is assumed.
-
smtpd_proxy_timeout (default: 100s): Timeout for connecting
to the before-queue content filter and for sending and receiving
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 2d30832f7..b0254a564 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.
*/
-#define MAIL_RELEASE_DATE "20041221"
+#define MAIL_RELEASE_DATE "20041230"
#define MAIL_VERSION_NUMBER "2.2"
#define VAR_MAIL_VERSION "mail_version"