From: Wietse Venema <wietse@porcupine.org>
Date: Sat, 23 Dec 2023 05:00:00 +0000 (-0500)
Subject: postfix-3.9-20231223
X-Git-Tag: v3.9.0~25
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f743309c6d1e556a218fa56d64fda3a952c843d1;p=thirdparty%2Fpostfix.git

postfix-3.9-20231223
---

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index da423cba1..d3ddc7f0d 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	"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 6f83b36b6..fe3ba8de4 100644
--- 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);