postfix-2.8-20100915

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 36a2f23296c9d28247ad090685d4baacd4410ec9..918563b10cd7d01c2940d617866763490068aa69 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -15992,3 +15992,8 @@ Apologies for any names omitted.
        this increases the database update frequency too much then
        we'll need to make dnsbl result non-cachable.  Files:
        postscreen/postscreen_dnsbl.c, global/mail_params.h.
+
+20100915
+
+       Bugfix (introduced 20100914): missing precondition for
+       call-back notification.  File: postscreen/dnsblog.c.

diff --git a/postfix/README_FILES/POSTSCREEN_README b/postfix/README_FILES/POSTSCREEN_README
index 1e4077ac9584e4b1addb2f18c01333a504ead2c0..a11a3d05c8cf344d63ea434b17ee04e09aa084a1 100644 (file)
--- a/postfix/README_FILES/POSTSCREEN_README
+++ b/postfix/README_FILES/POSTSCREEN_README
@@ -393,10 +393,10 @@ whitelist entry that excludes the client IP address from further tests until
 the temporary whitelist entry expires, as controlled with the postscreen_*_ttl
 parameters.
 
-When no "deep protocol tests" are configured, postscreen(8) passes the "live"
-connection to a Postfix SMTP server process. The client can then continue as if
-postscreen(8) never even existed (except for the short postscreen_greet_wait
-delay).
+When no "deep protocol tests" are configured, postscreen(8) hands off the
+"live" connection to a Postfix SMTP server process. The client can then
+continue as if postscreen(8) never even existed (except for the short
+postscreen_greet_wait delay).
 
 When any "deep protocol tests" are configured, postscreen(8) cannot hand off
 the "live" connection to a Postfix SMTP server process in the middle of the

diff --git a/postfix/html/POSTSCREEN_README.html b/postfix/html/POSTSCREEN_README.html
index f76d1050c821faf459df5c6315220a7e24b284b3..3843d51a0f9835d01875f3ea93e9dd89a64d530c 100644 (file)
--- a/postfix/html/POSTSCREEN_README.html
+++ b/postfix/html/POSTSCREEN_README.html
@@ -540,7 +540,7 @@ address from further tests until the temporary whitelist entry
 expires, as controlled with the postscreen_*_ttl parameters. </p>
 
 <p> When no "<a href="#after_220">deep protocol tests</a>" are
-configured, <a href="postscreen.8.html">postscreen(8)</a> passes the "live" connection to a Postfix
+configured, <a href="postscreen.8.html">postscreen(8)</a> hands off the "live" connection to a Postfix
 SMTP server process.  The client can then continue as if <a href="postscreen.8.html">postscreen(8)</a>
 never even existed (except for the short <a href="postconf.5.html#postscreen_greet_wait">postscreen_greet_wait</a> delay).
 </p>

diff --git a/postfix/proto/POSTSCREEN_README.html b/postfix/proto/POSTSCREEN_README.html
index eea09e73548fca30c5dc67c5d2afc274245058fb..036015f0d32b2abe91398e46dc16d4d393006db9 100644 (file)
--- a/postfix/proto/POSTSCREEN_README.html
+++ b/postfix/proto/POSTSCREEN_README.html
@@ -540,7 +540,7 @@ address from further tests until the temporary whitelist entry
 expires, as controlled with the postscreen_*_ttl parameters. </p>
 
 <p> When no "<a href="#after_220">deep protocol tests</a>" are
-configured, postscreen(8) passes the "live" connection to a Postfix
+configured, postscreen(8) hands off the "live" connection to a Postfix
 SMTP server process.  The client can then continue as if postscreen(8)
 never even existed (except for the short postscreen_greet_wait delay).
 </p>

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 47369cd68a356b60f0238b6eb4a8ac45a82f1694..d065a2c6d56d2e50f74329fbd145fd16e1115fa6 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      "20100914"
+#define MAIL_RELEASE_DATE      "20100915"
 #define MAIL_VERSION_NUMBER    "2.8"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postscreen/postscreen_dnsbl.c b/postfix/src/postscreen/postscreen_dnsbl.c
index f40520f8e1335808b0d5c16b4157f5b7b5d41db8..fffc6b49b7b37207b0dad6550d443f1c1c4aeb3c 100644 (file)
--- a/postfix/src/postscreen/postscreen_dnsbl.c
+++ b/postfix/src/postscreen/postscreen_dnsbl.c
@@ -357,19 +357,16 @@ static void ps_dnsbl_receive(int event, char *context)
        }
        if (reply_argv != 0)
            argv_free(reply_argv);
-    } else {
-       msg_warn("%s: unexpected event: %d", myname, event);
-    }
-
-    /*
-     * We're done with this stream. Notify the requestor(s) that the result
-     * is ready to be picked up. If this call isn't made, clients have to sit
-     * out the entire pre-handshake delay.
-     */
-    score->pending_lookups -= 1;
-    if (score->pending_lookups == 0)
-       PS_CALL_BACK_NOTIFY(score, PS_NULL_EVENT);
 
+       /*
+        * Notify the requestor(s) that the result is ready to be picked up.
+        * If this call isn't made, clients have to sit out the entire
+        * pre-handshake delay.
+        */
+       score->pending_lookups -= 1;
+       if (score->pending_lookups == 0)
+           PS_CALL_BACK_NOTIFY(score, PS_NULL_EVENT);
+    }
     vstream_fclose(stream);
 }