postfix-2.8-20100918

diff --git a/postfix/HISTORY b/postfix/HISTORY
index e4371d948475988b35e555286197078c58a96e70..3539c14b207d3ddde7202d85e61413942e95fef9 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -16028,3 +16028,8 @@ Apologies for any names omitted.
 
        Cleanup: postscreen now logs CONNECT and DISCONNECT events.
        Files: postscreen/postscreen.c, postscreen/postscreen_misc.c.
+
+20100917
+
+       Bugfix: cut-and-paste error. Postscreen used pregreet_ttl
+       instead of dnsbnl_ttl. File: postscreen/postscreen_early.c.

diff --git a/postfix/README_FILES/POSTSCREEN_README b/postfix/README_FILES/POSTSCREEN_README
index 6851341ea38463cab5f8efea441535da4cc61bb5..952f33402d55dd4cdc467d65b48b5431ad08af2e 100644 (file)
--- a/postfix/README_FILES/POSTSCREEN_README
+++ b/postfix/README_FILES/POSTSCREEN_README
@@ -452,7 +452,8 @@ mail:
 
     /etc/postfix/main.cf:
         postscreen_dnsbl_threshold = 2
-        postscreen_dnsbl_sites = zen.spamhaus.org*2 example.com*1 example.net*1
+        postscreen_dnsbl_sites = zen.spamhaus.org*2
+            bl.spamcop.net*1 b.barracudacentral.org*1
 
     Note: if your DNSBL queries have a "secret" in the domain name, you must
     censor this information from the postscreen(8) SMTP replies. For example:
@@ -575,6 +576,5 @@ so he added support for DNSBL weights and filters in August, followed by a
 major code rewrite, deep protocol tests, helo/sender/recipient logging, and
 stress-adaptive behavior in September. Ralf Hildebrandt ran this code on
 several servers to collect real-world statistics. This version still used the
-same delay for pregreet and DNSBL tests, as well as the embarrassing dnsblog(8)
-ad-hoc DNS client.
+embarrassing dnsblog(8) ad-hoc DNS client program.
 

diff --git a/postfix/html/POSTSCREEN_README.html b/postfix/html/POSTSCREEN_README.html
index d9734d344f5398c3f4af058f4cff29754c4adccd..33ef1a4f4dd53678dc6822dab24e492ec21bdf41 100644 (file)
--- a/postfix/html/POSTSCREEN_README.html
+++ b/postfix/html/POSTSCREEN_README.html
@@ -625,7 +625,8 @@ weights. For example:
 <pre>
 /etc/postfix/<a href="postconf.5.html">main.cf</a>:
     <a href="postconf.5.html#postscreen_dnsbl_threshold">postscreen_dnsbl_threshold</a> = 2
-    <a href="postconf.5.html#postscreen_dnsbl_sites">postscreen_dnsbl_sites</a> = zen.spamhaus.org*2 example.com*1 example.net*1
+    <a href="postconf.5.html#postscreen_dnsbl_sites">postscreen_dnsbl_sites</a> = zen.spamhaus.org*2 
+        bl.spamcop.net*1 b.barracudacentral.org*1
 </pre>
 
 <p> Note: if your DNSBL queries have a "secret" in the domain name,
@@ -794,9 +795,8 @@ in November 2010, so he added support for DNSBL weights and filters
 in August, followed by a major code rewrite, deep protocol tests,
 helo/sender/recipient logging, and stress-adaptive behavior in
 September. Ralf Hildebrandt ran this code on several servers to
-collect real-world statistics. This version still used the same
-delay for pregreet and DNSBL tests, as well as the embarrassing
-<a href="dnsblog.8.html">dnsblog(8)</a> ad-hoc DNS client.  </p>
+collect real-world statistics. This version still used the embarrassing
+<a href="dnsblog.8.html">dnsblog(8)</a> ad-hoc DNS client program.  </p>
 
 </body>
 

diff --git a/postfix/proto/POSTSCREEN_README.html b/postfix/proto/POSTSCREEN_README.html
index a7cdd5367c87bc7cad140706e4512c3d2497ddc2..40d9be062e337b623761e6a311c2db877930138e 100644 (file)
--- a/postfix/proto/POSTSCREEN_README.html
+++ b/postfix/proto/POSTSCREEN_README.html
@@ -625,7 +625,8 @@ weights. For example:
 <pre>
 /etc/postfix/main.cf:
     postscreen_dnsbl_threshold = 2
-    postscreen_dnsbl_sites = zen.spamhaus.org*2 example.com*1 example.net*1
+    postscreen_dnsbl_sites = zen.spamhaus.org*2 
+        bl.spamcop.net*1 b.barracudacentral.org*1
 </pre>
 
 <p> Note: if your DNSBL queries have a "secret" in the domain name,
@@ -794,9 +795,8 @@ in November 2010, so he added support for DNSBL weights and filters
 in August, followed by a major code rewrite, deep protocol tests,
 helo/sender/recipient logging, and stress-adaptive behavior in
 September. Ralf Hildebrandt ran this code on several servers to
-collect real-world statistics. This version still used the same
-delay for pregreet and DNSBL tests, as well as the embarrassing
-dnsblog(8) ad-hoc DNS client.  </p>
+collect real-world statistics. This version still used the embarrassing
+dnsblog(8) ad-hoc DNS client program.  </p>
 
 </body>
 

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 4c535474f0076c2719f585fc709537a64c98744b..1d8d21624bca3dd26e66839654d5e67837a46225 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20100917"
+#define MAIL_RELEASE_DATE      "20100918"
 #define MAIL_VERSION_NUMBER    "2.8"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postscreen/postscreen_early.c b/postfix/src/postscreen/postscreen_early.c
index 4cf380f50fc960542e22441aaec079321320f9d1..4131fa60ad59e9903caf843d667c382c2b4062a2 100644 (file)
--- a/postfix/src/postscreen/postscreen_early.c
+++ b/postfix/src/postscreen/postscreen_early.c
@@ -112,7 +112,7 @@ static void ps_early_event(int event, char *context)
            dnsbl_score =
                ps_dnsbl_retrieve(state->smtp_client_addr, &dnsbl_name);
            if (dnsbl_score < var_ps_dnsbl_thresh) {
-               state->dnsbl_stamp = event_time() + var_ps_pregr_ttl;
+               state->dnsbl_stamp = event_time() + var_ps_dnsbl_ttl;
                PS_PASS_SESSION_STATE(state, "dnsbl test",
                                      PS_STATE_FLAG_DNSBL_PASS);
            } else {