postfix-2.2-20041230

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 89ad8b42139775d9b1d4880d43fa8c276ce154c0..eef5f5c67ebca570187bbaea2233d6656903dc40 100644 (file)
--- 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 8125699314c870e5ddb23ad8b0d5814f0146d2c8..54e4fc938da31420d51b54cf008bca3c0d22a9a7 100644 (file)
--- 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 @@ C\bCo\bon\bnf\bfi\big\bgu\bur\bra\bat\bti\bio\bon\bn p\bpa\bar\bra\bam\bme\bet\bte\ber\brs\bs
 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 3004232eecf369b5f1a5a9295b24bf77a0900f5b..5b85b19598a8d4c4b510f017761b531218db89f1 100644 (file)
--- 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 <a href="postconf.5.html#smtpd_authorized_xforward_hosts">smtpd_authorized_xforward_hosts</a>=127.0.0.0/8
         -o <a href="postconf.5.html#smtpd_client_restrictions">smtpd_client_restrictions</a>=
         -o <a href="postconf.5.html#smtpd_helo_restrictions">smtpd_helo_restrictions</a>=
@@ -283,7 +283,8 @@ the top of the master.cf file: </p>
 
 <ul>
 
-    <li> <p> The ":10026" makes the after-filter SMTP server listen
+    <li> <p> 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 :-) </p>
@@ -314,7 +315,7 @@ can't control when the remote SMTP client times out. </p>
 
 <li> <p> <a href="postconf.5.html#smtpd_proxy_filter">smtpd_proxy_filter</a> (syntax: host:port): The host and TCP
 port of the before-queue content filter.  When no host or host:
-is specified, localhost is assumed. </p>
+is specified here, localhost is assumed. </p>
 
 <li> <p> <a href="postconf.5.html#smtpd_proxy_timeout">smtpd_proxy_timeout</a> (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 a9b21ddea9b78354549c7d90920c70f039b1a86e..7a39abe3e613edc812723f59761e102b57ba0bbb 100644 (file)
--- a/postfix/proto/SMTPD_PROXY_README.html
+++ b/postfix/proto/SMTPD_PROXY_README.html
@@ -240,7 +240,7 @@ http://bent.latency.net/smtpprox/. </p>
     # 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: </p>
 
 <ul>
 
-    <li> <p> The ":10026" makes the after-filter SMTP server listen
+    <li> <p> 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 :-) </p>
@@ -314,7 +315,7 @@ can't control when the remote SMTP client times out. </p>
 
 <li> <p> 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. </p>
+is specified in client context, localhost is assumed. </p>
 
 <li> <p> 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 2d30832f7e572004626f91378c0139ae5cf1c3f4..b0254a5643a2ba88604daad553fd6e2c085ad905 100644 (file)
--- 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"