postfix-3.9-20231223

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index da423cba187daf0be54950c4d170824540baeda7..d3ddc7f0d72ff711586e1731d26d23626b6fa269 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      "20231222"
+#define MAIL_RELEASE_DATE      "20231223"
 #define MAIL_VERSION_NUMBER    "3.9"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index 6f83b36b61a6865077ada50c0d94b44ac4d9ed13..fe3ba8de4dad7d25e75b1efd57a275cdbe4dd3de 100644 (file)
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -4772,6 +4772,9 @@ static int xclient_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
      */
     xclient_allowed =
        namadr_list_match(xclient_hosts, state->name, state->addr);
+    smtp_forbid_bare_lf = SMTPD_STAND_ALONE((state)) == 0
+       && var_smtpd_forbid_bare_lf
+       && !namadr_list_match(bare_lf_excl, state->name, state->addr);
     /* NOT: tls_reset() */
     if (got_helo == 0)
        helo_reset(state);