postfix-3.3-20170730

diff --git a/postfix/HISTORY b/postfix/HISTORY
index b13cc1c05b428d89f82664bf4bf92e4dac1079f8..432d6980bd888d354aba0a38292590e97d46d5c3 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23110,3 +23110,10 @@ Apologies for any names omitted.
        cleanup_out_recipient.c, global/mail_params.c, global/mail_copy.c,
        proto/postconf.proto proto/ADDRESS_VERIFICATION_README.html,
        local/local.c, virtual/virtual.c, pipe/pipe.c.
+
+20170730
+
+       Bugfix (introduced: yesterday): revert global/verify.c code
+       to always store the verify result under the original address,
+       and to conditionally store it under the rewritten address.
+       File: global/verify.c.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 5cf59b9904e420394c97679dd876d8d785ef6689..9e45f2ea8f14fbd986d3bcb94adf19cb1f879d7b 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      "20170729"
+#define MAIL_RELEASE_DATE      "20170730"
 #define MAIL_VERSION_NUMBER    "3.3"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/global/verify.c b/postfix/src/global/verify.c
index 67ba31b82cd4f8c63540ed9c5ea5e44e602cac4d..fbb8930f7a42e405714a1840674e2c7db2a2e82f 100644 (file)
--- a/postfix/src/global/verify.c
+++ b/postfix/src/global/verify.c
@@ -100,13 +100,14 @@ int     verify_append(const char *queue_id, MSG_STATS *stats,
      * XXX vrfy_stat is competely redundant because of dsn.
      */
     if (var_verify_neg_cache || vrfy_stat == DEL_RCPT_STAT_OK) {
-       req_stat = verify_clnt_update(recipient->address, vrfy_stat,
-                                     my_dsn.reason);
-       /* Two verify updates for one verify request! */
-       if (req_stat == VRFY_STAT_OK && recipient->orig_addr[0]
-         && strcasecmp_utf8(recipient->address, recipient->orig_addr) != 0)
+       if (recipient->orig_addr[0])
            req_stat = verify_clnt_update(recipient->orig_addr, vrfy_stat,
                                          my_dsn.reason);
+       /* Two verify updates for one verify request! */
+       if (req_stat == VRFY_STAT_OK
+           && strcmp(recipient->address, recipient->orig_addr) != 0)
+           req_stat = verify_clnt_update(recipient->address, vrfy_stat,
+                                         my_dsn.reason);
     } else {
        my_dsn.action = "undeliverable-but-not-cached";
        req_stat = VRFY_STAT_OK;