[exim-cvs] Avoid trying to send smtp repoonse for non-smtp i…

Top Page
Delete this message
Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Avoid trying to send smtp repoonse for non-smtp input, on datafile close error
Gitweb: https://git.exim.org/exim.git/commitdiff/e4520c7817b76d6a5453237d94b1ed10fa6d2ef3
Commit:     e4520c7817b76d6a5453237d94b1ed10fa6d2ef3
Parent:     5bca25510e7313419c4ed0107ae153177bee938c
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Dec 1 15:44:57 2023 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri Dec 1 15:44:57 2023 +0000


    Avoid trying to send smtp repoonse for non-smtp input, on datafile close error


    Broken-by: f70940c9489d
---
 src/src/receive.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


diff --git a/src/src/receive.c b/src/src/receive.c
index a459061ef..c4b80c236 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -4425,8 +4425,8 @@ if (spool_data_file && cutthrough_done == NOT_TRIED)
     Uunlink(spool_fname(US"input", message_subdir, message_id, US"-H"));
     Uunlink(spool_fname(US"msglog", message_subdir, message_id, US""));


-    /* Claim a data ACL temp-reject, just to get reject logging and resposponse */
-    smtp_handle_acl_fail(ACL_WHERE_DATA, rc, NULL, log_msg);
+    /* Claim a data ACL temp-reject, just to get reject logging and response */
+    if (smtp_input) smtp_handle_acl_fail(ACL_WHERE_DATA, rc, NULL, log_msg);
     smtp_reply = US"";        /* Indicate reply already sent */


     message_id[0] = 0;        /* no message accepted */


--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/