From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Wed, 12 Jan 2005 15:41:27 +0000 (+0000)
Subject: Use "system" message for $acl_verify_message if there is no "user"
X-Git-Tag: exim-4_50~34
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=6729cf789b50c427ecaf60fe1cf1b486ee9a71a8

Use "system" message for $acl_verify_message if there is no "user"
message.
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index ea2685f10..ac63deb12 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.67 2005/01/12 12:51:54 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.68 2005/01/12 15:41:27 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -304,6 +304,11 @@ Exim version 4.50
     negated items (that is, ~something) in unsigned ints. Some compilers
     apparently mutter when there is no cast.
 
+70. If an address verification called from an ACL failed, and did not produce a
+    user-specific message (i.e. there was only a "system" message), nothing was
+    put in $acl_verify_message. In this situation, it now puts the system
+    message there.
+
 
 Exim version 4.43
 -----------------
diff --git a/src/src/acl.c b/src/src/acl.c
index fb8590132..f7a551b74 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/acl.c,v 1.16 2005/01/12 14:41:12 ph10 Exp $ */
+/* $Cambridge: exim/src/src/acl.c,v 1.17 2005/01/12 15:41:27 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1345,8 +1345,10 @@ else
   rc = verify_address(&addr2, NULL, verify_options|vopt_is_recipient, callout,
     callout_overall, callout_connect, se_mailfrom, pm_mailfrom, NULL);
   HDEBUG(D_acl) debug_printf("----------- end verify ------------\n");
+  
   *log_msgptr = addr2.message;
-  *user_msgptr = addr2.user_message;
+  *user_msgptr = (addr2.user_message != NULL)? 
+    addr2.user_message : addr2.message;
   *basic_errno = addr2.basic_errno;
 
   /* Make $address_data visible */
diff --git a/src/src/verify.c b/src/src/verify.c
index a673c8c19..f5f6b5d32 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/verify.c,v 1.11 2005/01/12 14:47:42 ph10 Exp $ */
+/* $Cambridge: exim/src/src/verify.c,v 1.12 2005/01/12 15:41:27 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1100,7 +1100,7 @@ while (addr_new != NULL)
   want to continue to verify the new child. */
 
   if (rc == REROUTED) continue;
-
+  
   /* Handle hard failures */
 
   if (rc == FAIL)