postfix-2.8-20101007

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 83626729779a128c576e8fe7456168fcc14a38d7..20fa1ee173ae7c08398c3e38bf755ddb2cac25da 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -16072,3 +16072,7 @@ Apologies for any names omitted.
        will no longer result in repeated delivery to other mailing
        list members.  Specify "reset_owner_alias = yes" for the
        older behavior.  File: local/alias.c.
+
+20101007
+
+       Bugfix (introduced: 2100923): duplicate "PASS OLD" logging.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 953e47eef9f55f6832f35ad5a8ab8831131ec191..8569f945f23a2ec20b6811f8c6963a34f251bfd3 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      "20101006"
+#define MAIL_RELEASE_DATE      "20101007"
 #define MAIL_VERSION_NUMBER    "2.8"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/postscreen/postscreen_misc.c b/postfix/src/postscreen/postscreen_misc.c
index 0015ba99841b00385c4e8acd45bffd92dc3733a5..263a85020e3c252d7ae7d8899e41722aa81d2486 100644 (file)
--- a/postfix/src/postscreen/postscreen_misc.c
+++ b/postfix/src/postscreen/postscreen_misc.c
@@ -101,7 +101,8 @@ void    ps_conclude(PS_STATE *state)
     /*
      * Log our final blessing when all unfinished tests were completed.
      */
-    if ((state->flags & PS_STATE_MASK_ANY_PASS) ==
+    if ((state->flags & PS_STATE_MASK_ANY_PASS) != 0
+       && (state->flags & PS_STATE_MASK_ANY_PASS) ==
        PS_STATE_FLAGS_TODO_TO_PASS(state->flags & PS_STATE_MASK_ANY_TODO))
        msg_info("PASS %s %s", (state->flags & PS_STATE_FLAG_NEW) == 0 ?
                 "OLD" : "NEW", state->smtp_client_addr);