summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2005-09-26 09:52:18 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2005-09-26 09:52:18 +0000
commit16f12c7602daf6f4618d6b4bd037115fc7ee517e (patch)
tree6986533dc9a40afebe2dcb71caa8490a887f3b37
parented7dd10b6aa761886f01682c90e494c7247327ab (diff)
Allow the error for self=fail to be included in bounces.
-rw-r--r--doc/doc-txt/ChangeLog5
-rw-r--r--src/src/routers/rf_self_action.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 03be2f063..a77a223a4 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.239 2005/09/22 12:02:21 fanf2 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.240 2005/09/26 09:52:18 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -221,6 +221,9 @@ TF/08 Change PH/13 introduced the possibility that verify=helo may defer,
common situation. This change restores the behaviour of treating a
helo verification defer as a failure.
+PH/51 If self=fail was set on a router, the bounce message did not include the
+ actual error message.
+
Exim version 4.52
-----------------
diff --git a/src/src/routers/rf_self_action.c b/src/src/routers/rf_self_action.c
index 295b422ad..c0279ced6 100644
--- a/src/src/routers/rf_self_action.c
+++ b/src/src/routers/rf_self_action.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/routers/rf_self_action.c,v 1.2 2005/01/04 10:00:44 ph10 Exp $ */
+/* $Cambridge: exim/src/src/routers/rf_self_action.c,v 1.3 2005/09/26 09:52:18 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -133,6 +133,7 @@ switch (code)
debug_printf(": address failed (self = fail)\n");
}
addr->message = msg;
+ setflag(addr, af_pass_message);
return FAIL;
}