postfix-3.6-20210201

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 7df9fbeda677a6ed4c9c150d968b968d308f55ee..84639fa644a8b1e8de730a41c2ed0f3bf16808aa 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -25383,3 +25383,8 @@ Apologies for any names omitted.
        global/mail_params.c, global/mail_params.h, smtpd/smtpd.c,
        smtpd/smtpd_check.c.
 
+20210201
+
+       Flipped a bit in the smtpd_relay_before_recipient_restrictions
+       implementation. File: smtpd/smtpd_check.c.
+

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 16ccd87200cc6b271264ffb024c5d59c6a0dd501..bdbb35f48e01041ff673a57bfb27406c80189221 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      "20210131"
+#define MAIL_RELEASE_DATE      "20210201"
 #define MAIL_VERSION_NUMBER    "3.6"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c
index d96050ce29ecdb5c817c1926cf2af6ff5f114759..d584066be46593cd70e261fc3a3fdad57b149034 100644 (file)
--- a/postfix/src/smtpd/smtpd_check.c
+++ b/postfix/src/smtpd/smtpd_check.c
@@ -5102,7 +5102,7 @@ char   *smtpd_check_rcpt(SMTPD_STATE *state, char *recipient)
      * at the end would have blocked the request.
      * 
      * If warn_compat_break_relay_restrictions is true, always evaluate
-     * smtpd_relay_restrictions last (rcpt_index == 1). The backwards
+     * smtpd_relay_restrictions last (rcpt_index == 0). The backwards
      * compatibility warning says that it avoids blocking a recipient (with
      * "Relay access denied"); that is not useful information when moments
      * later, smtpd_recipient_restrictions blocks the recipient anyway (with
@@ -5110,7 +5110,7 @@ char   *smtpd_check_rcpt(SMTPD_STATE *state, char *recipient)
      */
     SMTPD_CHECK_RESET();
     rcpt_index = (var_relay_before_rcpt_checks
-                 || warn_compat_break_relay_restrictions);
+                 && !warn_compat_break_relay_restrictions);
     relay_index = !rcpt_index;
 
     restrctions[rcpt_index] = rcpt_restrctions;