ph10 2004/11/05 16:53:28 GMT
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/src expand.c globals.c globals.h verify.c
exim-test-orig/AutoTest/confs 257 437 585
exim-test-orig/AutoTest/log 085 238 244 257 306 437 585
exim-test-orig/AutoTest/rejectlog 257 437 585
exim-test-orig/AutoTest/stderr 257 437
Log:
Added $sender_verify_failure and $recipient_verify_failure to
distinguish in more detail what has failed (e.g. MAIL vs RCPT in a
callout).
Revision Changes Path
1.18 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.7 +21 -0 exim/exim-doc/doc-txt/NewStuff
1.3 +2 -0 exim/exim-src/src/expand.c
1.5 +2 -0 exim/exim-src/src/globals.c
1.5 +2 -0 exim/exim-src/src/globals.h
1.3 +27 -3 exim/exim-src/src/verify.c
1.2 +2 -0 exim/exim-test-orig/AutoTest/confs/257
1.2 +1 -0 exim/exim-test-orig/AutoTest/confs/437
1.3 +2 -1 exim/exim-test-orig/AutoTest/confs/585
1.2 +4 -0 exim/exim-test-orig/AutoTest/log/085
1.2 +2 -0 exim/exim-test-orig/AutoTest/log/238
1.2 +2 -0 exim/exim-test-orig/AutoTest/log/244
1.2 +4 -4 exim/exim-test-orig/AutoTest/log/257
1.2 +6 -0 exim/exim-test-orig/AutoTest/log/306
1.2 +4 -4 exim/exim-test-orig/AutoTest/log/437
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/585
1.2 +4 -4 exim/exim-test-orig/AutoTest/rejectlog/257
1.2 +4 -4 exim/exim-test-orig/AutoTest/rejectlog/437
1.2 +1 -1 exim/exim-test-orig/AutoTest/rejectlog/585
1.3 +4 -4 exim/exim-test-orig/AutoTest/stderr/257
1.3 +4 -4 exim/exim-test-orig/AutoTest/stderr/437
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog 5 Nov 2004 14:59:12 -0000 1.17
+++ ChangeLog 5 Nov 2004 16:53:28 -0000 1.18
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.17 2004/11/05 14:59:12 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.18 2004/11/05 16:53:28 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -64,6 +64,9 @@
17. A "Completed" log line is now written for messages that are removed from
the spool by the -Mrm option.
+
+18. New variables $sender_verify_failure and $recipient_verify_failure contain
+ information about exactly what failed.
Exim version 4.43
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NewStuff 4 Nov 2004 12:19:48 -0000 1.6
+++ NewStuff 5 Nov 2004 16:53:28 -0000 1.7
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.6 2004/11/04 12:19:48 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.7 2004/11/05 16:53:28 ph10 Exp $
New Features in Exim
--------------------
@@ -40,6 +40,27 @@
verify = sender/callout=5s,connect=1s
If not specified, it defaults to the general timeout value.
+
+ 7. The new variables $sender_verify_failure and $recipient_verify_failure
+ contain information about exactly what failed. In an ACL, after one of
+ these failures, the relevant variable contains one of the following words:
+
+ qualify the address was unqualified (no domain), and the message
+ was neither local nor came from an exempted host;
+
+ route routing failed;
+
+ mail routing succeeded, and a callout was attempted; rejection
+ occurred at or before the MAIL command (that is, on initial
+ connection, HELO, or MAIL);
+
+ recipient the RCPT command in a callout was rejected;
+
+ postmaster the postmaster check in a callout was rejected.
+
+ The main use of these variables is expected to be to distinguish between
+ rejections of MAIL and rejections of RCPT.
+
Version 4.43
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- expand.c 19 Oct 2004 13:40:39 -0000 1.2
+++ expand.c 5 Nov 2004 16:53:28 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.2 2004/10/19 13:40:39 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.3 2004/11/05 16:53:28 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -387,6 +387,7 @@
{ "received_for", vtype_stringptr, &received_for },
{ "received_protocol", vtype_stringptr, &received_protocol },
{ "recipient_data", vtype_stringptr, &recipient_data },
+ { "recipient_verify_failure",vtype_stringptr,&recipient_verify_failure },
{ "recipients", vtype_recipients, NULL },
{ "recipients_count", vtype_int, &recipients_count },
{ "reply_address", vtype_reply, NULL },
@@ -407,6 +408,7 @@
{ "sender_host_port", vtype_int, &sender_host_port },
{ "sender_ident", vtype_stringptr, &sender_ident },
{ "sender_rcvhost", vtype_stringptr, &sender_rcvhost },
+ { "sender_verify_failure",vtype_stringptr, &sender_verify_failure },
{ "smtp_command_argument", vtype_stringptr, &smtp_command_argument },
{ "sn0", vtype_filter_int, &filter_sn[0] },
{ "sn1", vtype_filter_int, &filter_sn[1] },
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- globals.c 19 Oct 2004 13:40:39 -0000 1.4
+++ globals.c 5 Nov 2004 16:53:28 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.4 2004/10/19 13:40:39 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.5 2004/11/05 16:53:28 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -742,6 +742,7 @@
int received_time = 0;
uschar *recipient_data = NULL;
uschar *recipient_unqualified_hosts = NULL;
+uschar *recipient_verify_failure = NULL;
int recipients_count = 0;
BOOL recipients_discarded = FALSE;
recipient_item *recipients_list = NULL;
@@ -879,6 +880,7 @@
uschar *sender_rcvhost = NULL;
BOOL sender_set_untrusted = FALSE;
uschar *sender_unqualified_hosts = NULL;
+uschar *sender_verify_failure = NULL;
address_item *sender_verified_list = NULL;
address_item *sender_verified_failed = NULL;
int sender_verified_rc = -1;
Index: globals.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- globals.h 19 Oct 2004 13:40:39 -0000 1.4
+++ globals.h 5 Nov 2004 16:53:28 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.h,v 1.4 2004/10/19 13:40:39 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.h,v 1.5 2004/11/05 16:53:28 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -453,6 +453,7 @@
extern int received_time; /* Time the message was received */
extern uschar *recipient_data; /* lookup data for recipients */
extern uschar *recipient_unqualified_hosts; /* Permitted unqualified recipients */
+extern uschar *recipient_verify_failure; /* What went wrong */
extern BOOL recipients_discarded; /* By an ACL */
extern int recipients_list_max; /* Maximum number fitting in list */
extern int recipients_max; /* Max permitted */
@@ -505,6 +506,7 @@
extern uschar *sender_rcvhost; /* Host data for Received: */
extern BOOL sender_set_untrusted; /* Sender set by untrusted caller */
extern uschar *sender_unqualified_hosts; /* Permitted unqualified senders */
+extern uschar *sender_verify_failure; /* What went wrong */
extern address_item *sender_verified_list; /* Saved chain of sender verifies */
extern address_item *sender_verified_failed; /* The one that caused denial */
extern volatile BOOL sigalrm_seen; /* Flag for sigalrm_handler */
Index: verify.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/verify.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- verify.c 4 Nov 2004 12:19:48 -0000 1.2
+++ verify.c 5 Nov 2004 16:53:28 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/verify.c,v 1.2 2004/11/04 12:19:48 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/verify.c,v 1.3 2004/11/05 16:53:28 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -151,6 +151,8 @@
uschar *address_key;
uschar *from_address;
uschar *random_local_part = NULL;
+uschar **failure_ptr = is_recipient?
+ &recipient_verify_failure : &sender_verify_failure;
open_db dbblock;
open_db *dbm_file = NULL;
dbdata_callout_cache new_domain_record;
@@ -236,6 +238,7 @@
setflag(addr, af_verify_nsfail);
addr->user_message = US"(result of an earlier callout reused).";
yield = FAIL;
+ *failure_ptr = US"mail";
goto END_CALLOUT;
}
@@ -282,6 +285,7 @@
debug_printf("callout cache: domain does not accept "
"RCPT TO:<postmaster@domain>\n");
yield = FAIL;
+ *failure_ptr = US"postmaster";
setflag(addr, af_verify_pmfail);
addr->user_message = US"(result of earlier verification reused).";
goto END_CALLOUT;
@@ -330,6 +334,7 @@
HDEBUG(D_verify)
debug_printf("callout cache: address record is negative\n");
addr->user_message = US"Previous (cached) callout verification failure";
+ *failure_ptr = US"recipient";
yield = FAIL;
}
goto END_CALLOUT;
@@ -476,6 +481,7 @@
if (!done)
{
+ *failure_ptr = US"mail";
if (errno == 0 && responsebuffer[0] == '5')
{
setflag(addr, af_verify_nsfail);
@@ -550,7 +556,10 @@
if (done)
new_address_record.result = ccache_accept;
else if (errno == 0 && responsebuffer[0] == '5')
+ {
+ *failure_ptr = US"recipient";
new_address_record.result = ccache_reject;
+ }
/* Do postmaster check if requested */
@@ -577,6 +586,7 @@
new_domain_record.postmaster_result = ccache_accept;
else if (errno == 0 && responsebuffer[0] == '5')
{
+ *failure_ptr = US"postmaster";
setflag(addr, af_verify_pmfail);
new_domain_record.postmaster_result = ccache_reject;
}
@@ -810,7 +820,6 @@
BOOL full_info = (f == NULL)? FALSE : (debug_selector != 0);
BOOL is_recipient = (options & vopt_is_recipient) != 0;
BOOL expn = (options & vopt_expn) != 0;
-
int i;
int yield = OK;
int verify_type = expn? v_expn :
@@ -821,11 +830,17 @@
address_item *addr_remote = NULL;
address_item *addr_local = NULL;
address_item *addr_succeed = NULL;
+uschar **failure_ptr = is_recipient?
+ &recipient_verify_failure : &sender_verify_failure;
uschar *ko_prefix, *cr;
uschar *address = vaddr->address;
uschar *save_sender;
uschar null_sender[] = { 0 }; /* Ensure writeable memory */
+/* Clear, just in case */
+
+*failure_ptr = NULL;
+
/* Set up a prefix and suffix for error message which allow us to use the same
output statements both in EXPN mode (where an SMTP response is needed) and when
debugging with an output file. */
@@ -846,6 +861,7 @@
if (f != NULL)
fprintf(f, "%sA domain is required for \"%s\"%s\n", ko_prefix, address,
cr);
+ *failure_ptr = US"qualify";
return FAIL;
}
address = rewrite_address_qualify(address, is_recipient);
@@ -1044,7 +1060,8 @@
}
}
- /* Can only do a callout if we have at least one host! */
+ /* Can only do a callout if we have at least one host! If the callout
+ fails, it will have set ${sender,recipient}_verify_failure. */
if (host_list != NULL)
{
@@ -1068,6 +1085,10 @@
}
}
}
+
+ /* Otherwise, any failure is a routing failure */
+
+ else *failure_ptr = US"route";
/* A router may return REROUTED if it has set up a child address as a result
of a change of domain name (typically from widening). In this case we always
@@ -1255,7 +1276,10 @@
}
}
-return yield; /* Will be DEFER or FAIL if any one address has */
+/* Will be DEFER or FAIL if any one address has, only for full_info (which is
+the -bv or -bt case). */
+
+return yield;
}
Index: 257
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/257,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 257 8 Oct 2004 14:49:15 -0000 1.1
+++ 257 5 Nov 2004 16:53:28 -0000 1.2
@@ -27,8 +27,10 @@
deny hosts = 10.0.0.1
!verify = sender/callout=no_cache
deny hosts = 10.0.0.3
+ log_message = ($recipient_verify_failure)
!verify = recipient/callout=no_cache
deny hosts = 10.0.0.5
+ log_message = ($sender_verify_failure)
!verify = sender/callout=no_cache/check_postmaster
require verify = sender
accept domains = +local_domains
Index: 437
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/437,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 437 8 Oct 2004 14:49:16 -0000 1.1
+++ 437 5 Nov 2004 16:53:28 -0000 1.2
@@ -26,6 +26,7 @@
check_recipient:
deny hosts = 10.0.0.1
+ log_message = ($sender_verify_failure)
!verify = sender/callout
deny hosts = 10.0.0.2
!verify = sender/callout=postmaster
Index: 585
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/585,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 585 19 Oct 2004 11:29:25 -0000 1.2
+++ 585 5 Nov 2004 16:53:28 -0000 1.3
@@ -23,7 +23,8 @@
acl_predata:
warn message = X-warning: this is a test warning ($recipients)
- accept verify = sender
+ accept log_message = sender verify failed ($sender_verify_failure)
+ verify = sender
# ------ Routers ------
Index: 085
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/085,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 085 8 Oct 2004 14:49:31 -0000 1.1
+++ 085 5 Nov 2004 16:53:28 -0000 1.2
@@ -77,9 +77,13 @@
1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmaX-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmbD-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
1999-03-02 09:44:33 10HmbI-0005vi-00 <= ph10@??? U=ph10 P=local S=282
1999-03-02 09:44:33 10HmbI-0005vi-00 == defer@??? R=alias defer (-1): This address has been forced to defer.
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
Index: 238
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/238,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 238 8 Oct 2004 14:49:31 -0000 1.1
+++ 238 5 Nov 2004 16:53:28 -0000 1.2
@@ -7,7 +7,9 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 == philip@domain1 routing defer (-51): retry time not reached
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 10HmaX-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=262
1999-03-02 09:44:33 10HmaZ-0005vi-00 == ph@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued
1999-03-02 09:44:33 10HmaZ-0005vi-00 == phil@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued
Index: 244
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/244,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 244 8 Oct 2004 14:49:31 -0000 1.1
+++ 244 5 Nov 2004 16:53:28 -0000 1.2
@@ -12,6 +12,7 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <ph10@???> R=bounces
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmaY-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=266
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
1999-03-02 09:44:33 10HmbA-0005vi-00 == jack@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
@@ -23,6 +24,7 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <ph10@???> R=bounces
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=266
1999-03-02 09:44:33 10HmbC-0005vi-00 ** ph10@??? F=<ph10@???> R=smartuser T=lmtp: SMTP error from remote mailer after RCPT TO:<ph10@???>: host 127.0.0.1 [127.0.0.1]: 550 Receiver BAD
1999-03-02 09:44:33 10HmbC-0005vi-00 == jack@??? R=smartuser T=lmtp defer (0): LMTP error after DATA: 440 Temporary error
Index: 257
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/257,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 257 8 Oct 2004 14:49:31 -0000 1.1
+++ 257 5 Nov 2004 16:53:28 -0000 1.2
@@ -6,15 +6,15 @@
1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550-Multiline error for <>\n550 Here's the second line
1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
-1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second
+1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: (recipient): response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
+1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: (recipient): response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second
1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete recipient verify callout
1999-03-02 09:44:33 10HmaX-0005vi-00 H=[10.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
1999-03-02 09:44:33 10HmaY-0005vi-00 H=[10.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
1999-03-02 09:44:33 H=[10.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
1999-03-02 09:44:33 H=[10.0.0.5] U=root sender verify fail for <ok@localhost1>: response to "RCPT TO:<postmaster@localhost1>" from 127.0.0.1 [127.0.0.1] was: 550 Don't like postmaster
-1999-03-02 09:44:33 H=[10.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
+1999-03-02 09:44:33 H=[10.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: (postmaster): Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: (recipient): response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify defer for <bad@localhost1>: response to "initial connection" from 127.0.0.1 [127.0.0.1] was: connection dropped
1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify defer for <bad@localhost1>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused
Index: 306
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/306,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 306 8 Oct 2004 14:49:31 -0000 1.1
+++ 306 5 Nov 2004 16:53:28 -0000 1.2
@@ -21,9 +21,13 @@
1999-03-02 09:44:33 10HmbC-0005vi-00 == notuser3@??? R=r2 T=local_delivery2 defer (-52): Retry time not yet reached
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 10HmaX-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmbC-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=253
1999-03-02 09:44:33 10HmbD-0005vi-00 == r3.a@outside R=r3 defer (-1): not just now
1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=253
@@ -32,7 +36,9 @@
1999-03-02 09:44:33 10HmbE-0005vi-00 == r3.b@outside R=r3 defer (-1): not just now
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 10HmbD-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
1999-03-02 09:44:33 10HmbE-0005vi-00 removed by ph10
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 <= ph10@??? U=ph10 P=local S=253
1999-03-02 09:44:33 10HmbF-0005vi-00 == r4.a@outside R=r4 defer (-1): not just now
1999-03-02 09:44:33 10HmbG-0005vi-00 <= ph10@??? U=ph10 P=local S=253
Index: 437
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/437,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 437 8 Oct 2004 14:49:31 -0000 1.1
+++ 437 5 Nov 2004 16:53:28 -0000 1.2
@@ -1,13 +1,13 @@
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify defer for <ok@localhost>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused
1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <bad@localhost>: response to "RCPT TO:<bad@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 REJECTED
-1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <ok@localhost>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550 REJECT MAIL FROM
-1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.2] U=root sender verify fail for <ok@otherhost>: response to "RCPT TO:<postmaster@otherhost>" from 127.0.0.1 [127.0.0.1] was: 550 NOT OK
1999-03-02 09:44:33 H=[10.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.2] U=root sender verify fail for <ok@otherhost>
Index: 585
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/585,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 585 19 Oct 2004 11:29:25 -0000 1.2
+++ 585 5 Nov 2004 16:53:28 -0000 1.3
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 U=ph10 sender verify fail for <x@y>: Unrouteable address
-1999-03-02 09:44:33 U=ph10 rejected DATA: Sender verify failed
+1999-03-02 09:44:33 U=ph10 rejected DATA: sender verify failed (route): Sender verify failed
1999-03-02 09:44:33 10HmaX-0005vi-00 <= postmaster@y U=ph10 P=local-smtp S=297
1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@y> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 257
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/257,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 257 8 Oct 2004 14:49:51 -0000 1.1
+++ 257 5 Nov 2004 16:53:28 -0000 1.2
@@ -6,8 +6,8 @@
1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550-Multiline error for <>\n550 Here's the second line
1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
-1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second
+1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: (recipient): response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
+1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: (recipient): response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second
1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@???>: Could not complete recipient verify callout
1999-03-02 09:44:33 10HmaX-0005vi-00 H=[10.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
Envelope-from: <uncheckable@localhost1>
@@ -27,8 +27,8 @@
F From: abcd@???
1999-03-02 09:44:33 H=[10.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: relay not permitted
1999-03-02 09:44:33 H=[10.0.0.5] U=root sender verify fail for <ok@localhost1>: response to "RCPT TO:<postmaster@localhost1>" from 127.0.0.1 [127.0.0.1] was: 550 Don't like postmaster
-1999-03-02 09:44:33 H=[10.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: Sender verify failed
-1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
+1999-03-02 09:44:33 H=[10.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: (postmaster): Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: (recipient): response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify defer for <bad@localhost1>: response to "initial connection" from 127.0.0.1 [127.0.0.1] was: connection dropped
1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify defer for <bad@localhost1>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused
Index: 437
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/437,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 437 8 Oct 2004 14:49:51 -0000 1.1
+++ 437 5 Nov 2004 16:53:28 -0000 1.2
@@ -1,13 +1,13 @@
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify defer for <ok@localhost>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused
1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@???>: Could not complete sender verify callout
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <bad@localhost>: response to "RCPT TO:<bad@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 REJECTED
-1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <ok@localhost>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550 REJECT MAIL FROM
-1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: Sender verify failed
+1999-03-02 09:44:33 H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.2] U=root sender verify fail for <ok@otherhost>: response to "RCPT TO:<postmaster@otherhost>" from 127.0.0.1 [127.0.0.1] was: 550 NOT OK
1999-03-02 09:44:33 H=[10.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@???>: Sender verify failed
1999-03-02 09:44:33 H=[10.0.0.2] U=root sender verify fail for <ok@otherhost>
Index: 585
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/rejectlog/585,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 585 8 Oct 2004 14:49:51 -0000 1.1
+++ 585 5 Nov 2004 16:53:28 -0000 1.2
@@ -1,2 +1,2 @@
1999-03-02 09:44:33 U=ph10 sender verify fail for <x@y>: Unrouteable address
-1999-03-02 09:44:33 U=ph10 rejected DATA: Sender verify failed
+1999-03-02 09:44:33 U=ph10 rejected DATA: sender verify failed (route): Sender verify failed
Index: 257
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/257,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 257 4 Nov 2004 12:19:49 -0000 1.2
+++ 257 5 Nov 2004 16:53:28 -0000 1.3
@@ -92,7 +92,7 @@
SMTP<< 550 Recipient not liked
SMTP>> QUIT
LOG: MAIN REJECT
- H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
+ H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: (recipient): response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -108,7 +108,7 @@
550 Here's the second
SMTP>> QUIT
LOG: MAIN REJECT
- H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second
+ H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: (recipient): response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -190,7 +190,7 @@
LOG: MAIN REJECT
H=[10.0.0.5] U=root sender verify fail for <ok@localhost1>: response to "RCPT TO:<postmaster@localhost1>" from 127.0.0.1 [127.0.0.1] was: 550 Don't like postmaster
LOG: MAIN REJECT
- H=[10.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: Sender verify failed
+ H=[10.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: (postmaster): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
@@ -205,7 +205,7 @@
SMTP<< 550 Recipient not liked
SMTP>> QUIT
LOG: MAIN REJECT
- H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
+ H=[10.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@???>: (recipient): response to "RCPT TO:<z@???>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
LOG: smtp_connection MAIN
Index: 437
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/437,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 437 4 Nov 2004 12:19:49 -0000 1.2
+++ 437 5 Nov 2004 16:53:28 -0000 1.3
@@ -108,7 +108,7 @@
LOG: MAIN REJECT
H=[10.0.0.1] U=root sender verify fail for <bad@localhost>: response to "RCPT TO:<bad@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 REJECTED
LOG: MAIN REJECT
- H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
+ H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -132,7 +132,7 @@
LOG: MAIN REJECT
H=[10.0.0.1] U=root sender verify fail for <bad@localhost>
LOG: MAIN REJECT
- H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: Sender verify failed
+ H=[10.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@???>: (recipient): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -165,7 +165,7 @@
LOG: MAIN REJECT
H=[10.0.0.1] U=root sender verify fail for <ok@localhost>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550 REJECT MAIL FROM
LOG: MAIN REJECT
- H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: Sender verify failed
+ H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -188,7 +188,7 @@
LOG: MAIN REJECT
H=[10.0.0.1] U=root sender verify fail for <ok@localhost>
LOG: MAIN REJECT
- H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: Sender verify failed
+ H=[10.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@???>: (mail): Sender verify failed
LOG: smtp_connection MAIN
SMTP connection from root closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
