diff --git a/postfix/HISTORY b/postfix/HISTORY index 7df9fbeda..84639fa64 100644 --- 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 16ccd8720..bdbb35f48 100644 --- 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 d96050ce2..d584066be 100644 --- 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;