ph10 2005/11/11 10:02:05 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src filter.c host.c
exim-test-orig/AutoTest/log 024 055 079 167 168 256 270 284
439 444 470
exim-test-orig/AutoTest/mail 024.ph10 167.ph10 168.ph10
256.ph10 270.ph10 444.ph10
exim-test-orig/AutoTest/stderr 353 439 470 559
exim-test-orig/AutoTest/stdout 001 002 439
Log:
1. Don't show helo=[<ip address>] unnecessarily. 2. Update old test
suite for recent changes.
Revision Changes Path
1.254 +12 -0 exim/exim-doc/doc-txt/ChangeLog
1.7 +11 -2 exim/exim-src/src/filter.c
1.17 +57 -48 exim/exim-src/src/host.c
1.3 +5 -5 exim/exim-test-orig/AutoTest/log/024
1.2 +5 -5 exim/exim-test-orig/AutoTest/log/055
1.5 +1 -1 exim/exim-test-orig/AutoTest/log/079
1.3 +2 -2 exim/exim-test-orig/AutoTest/log/167
1.3 +2 -2 exim/exim-test-orig/AutoTest/log/168
1.3 +1 -1 exim/exim-test-orig/AutoTest/log/256
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/270
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/284
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/439
1.3 +3 -3 exim/exim-test-orig/AutoTest/log/444
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/470
1.3 +10 -10 exim/exim-test-orig/AutoTest/mail/024.ph10
1.3 +4 -4 exim/exim-test-orig/AutoTest/mail/167.ph10
1.3 +4 -4 exim/exim-test-orig/AutoTest/mail/168.ph10
1.3 +2 -2 exim/exim-test-orig/AutoTest/mail/256.ph10
1.2 +2 -2 exim/exim-test-orig/AutoTest/mail/270.ph10
1.3 +6 -6 exim/exim-test-orig/AutoTest/mail/444.ph10
1.3 +6 -6 exim/exim-test-orig/AutoTest/stderr/353
1.4 +9 -9 exim/exim-test-orig/AutoTest/stderr/439
1.10 +12 -12 exim/exim-test-orig/AutoTest/stderr/470
1.3 +1 -1 exim/exim-test-orig/AutoTest/stderr/559
1.17 +1 -1 exim/exim-test-orig/AutoTest/stdout/001
1.14 +1 -1 exim/exim-test-orig/AutoTest/stdout/002
1.2 +1 -1 exim/exim-test-orig/AutoTest/stdout/439
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- ChangeLog 10 Nov 2005 15:00:46 -0000 1.253
+++ ChangeLog 11 Nov 2005 10:02:04 -0000 1.254
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.253 2005/11/10 15:00:46 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.254 2005/11/11 10:02:04 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -51,6 +51,18 @@
this:
=> >ano@???,ona@??? <original@ddress> ...
+
+PH/06 When a client host used a correct literal IP address in a HELO or EHLO
+ command, (for example, EHLO [1.2.3.4]) and the client's IP address was
+ not being looked up in the rDNS to get a host name, Exim was showing the
+ IP address twice in Received: lines, even though the IP addresses were
+ identical. For example:
+
+ Received: from [1.2.3.4] (helo=[1.2.3.4])
+
+ However, if the real host name was known, it was omitting the HELO data
+ if it matched the actual IP address. This has been tidied up so that it
+ doesn't show the same IP address twice.
Exim version 4.54
Index: filter.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/filter.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- filter.c 10 Nov 2005 15:00:46 -0000 1.6
+++ filter.c 11 Nov 2005 10:02:04 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/filter.c,v 1.6 2005/11/10 15:00:46 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/filter.c,v 1.7 2005/11/11 10:02:04 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2240,9 +2240,10 @@
}
/* Create the "address" for the autoreply. This is used only for logging,
- as the actual recipients are extraced from the To: line by -t. We use the
+ as the actual recipients are extracted from the To: line by -t. We use the
same logic here to extract the working addresses (there may be more than
- one). */
+ one). Just in case there are a vast number of addresses, stop when the
+ string gets too long. */
tt = to;
while (*tt != 0)
@@ -2266,6 +2267,14 @@
(log_addr == NULL)? US">" : US",", 1);
log_addr = string_cat(log_addr, &size, &ptr, recipient,
Ustrlen(recipient));
+ }
+
+ /* Check size */
+
+ if (ptr > 256)
+ {
+ log_addr = string_cat(log_addr, &size, &ptr, US", ...", 5);
+ break;
}
/* Move on past this address */
Index: host.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/host.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- host.c 3 Oct 2005 09:51:04 -0000 1.16
+++ host.c 11 Nov 2005 10:02:04 -0000 1.17
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/host.c,v 1.16 2005/10/03 09:51:04 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/host.c,v 1.17 2005/11/11 10:02:04 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -535,8 +535,9 @@
(a) No sender_host_name or sender_helo_name: "[ip address]"
(b) Just sender_host_name: "host_name [ip address]"
-(c) Just sender_helo_name: "(helo_name) [ip address]"
-(d) The two are identical: "host_name [ip address]"
+(c) Just sender_helo_name: "(helo_name) [ip address]" unless helo is IP
+ in which case: "[ip address}"
+(d) The two are identical: "host_name [ip address]" includes helo = IP
(e) The two are different: "host_name (helo_name) [ip address]"
If log_incoming_port is set, the sending host's port number is added to the IP
@@ -557,7 +558,9 @@
void
host_build_sender_fullhost(void)
{
+BOOL show_helo = TRUE;
uschar *address;
+int len;
int old_pool = store_pool;
if (sender_host_address == NULL) return;
@@ -573,6 +576,43 @@
if ((log_extra_selector & LX_incoming_port) == 0 || sender_host_port <= 0)
*(Ustrrchr(address, ':')) = 0;
+/* If there's no EHLO/HELO data, we can't show it. */
+
+if (sender_helo_name == NULL) show_helo = FALSE;
+
+/* If HELO/EHLO was followed by an IP literal, it's messy because of two
+features of IPv6. Firstly, there's the "IPv6:" prefix (Exim is liberal and
+doesn't require this, for historical reasons). Secondly, IPv6 addresses may not
+be given in canonical form, so we have to canonicize them before comparing. As
+it happens, the code works for both IPv4 and IPv6. */
+
+else if (sender_helo_name[0] == '[' &&
+ sender_helo_name[(len=Ustrlen(sender_helo_name))-1] == ']')
+ {
+ int offset = 1;
+ uschar *helo_ip;
+
+ if (strncmpic(sender_helo_name + 1, US"IPv6:", 5) == 0) offset += 5;
+ if (strncmpic(sender_helo_name + 1, US"IPv4:", 5) == 0) offset += 5;
+
+ helo_ip = string_copyn(sender_helo_name + offset, len - offset - 1);
+
+ if (string_is_ip_address(helo_ip, NULL) != 0)
+ {
+ int x[4], y[4];
+ int sizex, sizey;
+ uschar ipx[48], ipy[48]; /* large enough for full IPv6 */
+
+ sizex = host_aton(helo_ip, x);
+ sizey = host_aton(sender_host_address, y);
+
+ (void)host_nmtoa(sizex, x, -1, ipx, ':');
+ (void)host_nmtoa(sizey, y, -1, ipy, ':');
+
+ if (strcmpic(ipx, ipy) == 0) show_helo = FALSE;
+ }
+ }
+
/* Host name is not verified */
if (sender_host_name == NULL)
@@ -588,7 +628,7 @@
sender_rcvhost = string_cat(NULL, &size, &ptr, address, adlen);
- if (sender_ident != NULL || sender_helo_name != NULL || portptr != NULL)
+ if (sender_ident != NULL || show_helo || portptr != NULL)
{
int firstptr;
sender_rcvhost = string_cat(sender_rcvhost, &size, &ptr, US" (", 2);
@@ -598,7 +638,7 @@
sender_rcvhost = string_append(sender_rcvhost, &size, &ptr, 2, US"port=",
portptr + 1);
- if (sender_helo_name != NULL)
+ if (show_helo)
sender_rcvhost = string_append(sender_rcvhost, &size, &ptr, 2,
(firstptr == ptr)? US"helo=" : US" helo=", sender_helo_name);
@@ -617,54 +657,15 @@
store_reset(sender_rcvhost + ptr + 1);
}
-/* Host name is known and verified. */
+/* Host name is known and verified. Unless we've already found that the HELO
+data matches the IP address, compare it with the name. */
else
{
- int len;
- BOOL no_helo = FALSE;
-
- /* Comparing a HELO name to a host name is easy */
-
- if (sender_helo_name == NULL ||
- strcmpic(sender_host_name, sender_helo_name) == 0)
- no_helo = TRUE;
-
- /* If HELO/EHLO was followed by an IP literal, it's much more messy because
- of two features of IPv6. Firstly, there's the "IPv6:" prefix (Exim is liberal
- and doesn't require this, for historical reasons). Secondly, an IPv6 address
- may not be given in canonical form, so we have to canonicize it before
- comparing. As it happens, the code works for both IPv4 and IPv6. */
-
- else if (sender_helo_name[0] == '[' &&
- sender_helo_name[(len=Ustrlen(sender_helo_name))-1] == ']')
- {
- uschar *helo_ip;
- int offset = 1;
-
- if (strncmpic(sender_helo_name+1, US"IPv6:",5) == 0) offset += 5;
- helo_ip = string_copyn(sender_helo_name + offset, len - offset - 1);
+ if (show_helo && strcmpic(sender_host_name, sender_helo_name) == 0)
+ show_helo = FALSE;
- if (string_is_ip_address(helo_ip, NULL) != 0)
- {
- int x[4];
- int size;
- size = host_aton(helo_ip, x);
- helo_ip = store_get(48); /* large enough for full IPv6 */
- (void)host_nmtoa(size, x, -1, helo_ip, ':');
- if (strcmpic(helo_ip, sender_host_address) == 0) no_helo = TRUE;
- }
- }
-
- if (no_helo)
- {
- sender_fullhost = string_sprintf("%s %s", sender_host_name, address);
- sender_rcvhost = (sender_ident == NULL)?
- string_sprintf("%s (%s)", sender_host_name, address) :
- string_sprintf("%s (%s ident=%s)", sender_host_name, address,
- sender_ident);
- }
- else
+ if (show_helo)
{
sender_fullhost = string_sprintf("%s (%s) %s", sender_host_name,
sender_helo_name, address);
@@ -673,6 +674,14 @@
address, sender_helo_name) :
string_sprintf("%s\n\t(%s helo=%s ident=%s)", sender_host_name,
address, sender_helo_name, sender_ident);
+ }
+ else
+ {
+ sender_fullhost = string_sprintf("%s %s", sender_host_name, address);
+ sender_rcvhost = (sender_ident == NULL)?
+ string_sprintf("%s (%s)", sender_host_name, address) :
+ string_sprintf("%s (%s ident=%s)", sender_host_name, address,
+ sender_ident);
}
}
Index: 024
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/024,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 024 14 Oct 2004 11:16:36 -0000 1.2
+++ 024 11 Nov 2005 10:02:04 -0000 1.3
@@ -1,35 +1,35 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=284
1999-03-02 09:44:33 10HmaX-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/showenv <pipe@???> R=system_aliases T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2087
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2088
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=279
1999-03-02 09:44:33 10HmaZ-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv <prefixed+pipe@???> R=system_aliases T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2122
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2123
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=279
1999-03-02 09:44:33 10HmbB-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
1999-03-02 09:44:33 10HmbB-0005vi-00 ** |/source/exim4/AutoTest/showenv <pipe-suffixed@???> R=system_aliases T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=2122
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=2123
1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=288
1999-03-02 09:44:33 10HmbD-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
1999-03-02 09:44:33 10HmbD-0005vi-00 ** |/source/exim4/AutoTest/showenv <prefixed+pipe-suffixed@???> R=system_aliases T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=2185
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=2186
1999-03-02 09:44:33 10HmbE-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 <= ph10@??? U=ph10 P=local S=284
1999-03-02 09:44:33 10HmbF-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
1999-03-02 09:44:33 10HmbF-0005vi-00 ** |/source/exim4/AutoTest/showenv <pipe@???> R=system_aliases T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=2087
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=2088
1999-03-02 09:44:33 10HmbG-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
Index: 055
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/055,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 055 8 Oct 2004 14:49:31 -0000 1.1
+++ 055 11 Nov 2005 10:02:04 -0000 1.2
@@ -3,18 +3,18 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=ph10 P=local S=408
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaX-0005vi-00 => >Philip Hazel <ph10@???> <ph10@???> R=forwardfile T=address_reply
+1999-03-02 09:44:33 10HmaX-0005vi-00 => >ph10@??? <ph10@???> R=forwardfile T=address_reply
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=289
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => >Philip Hazel <ph10@???> <ph10@???> R=forwardfile T=address_reply
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => >ph10@??? <ph10@???> R=forwardfile T=address_reply
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local S=288
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=ph10 P=local S=408
1999-03-02 09:44:33 10HmbB-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 => >Philip Hazel <ph10@???> <ph10@???> R=forwardfile T=address_reply
+1999-03-02 09:44:33 10HmbA-0005vi-00 => >ph10@??? <ph10@???> R=forwardfile T=address_reply
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=304
1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
@@ -22,7 +22,7 @@
1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <abcd@???> R=abcd
1999-03-02 09:44:33 10HmbD-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 => >ph10, abey seedy <abcd> <ph10@???> R=forwardfile T=address_reply
+1999-03-02 09:44:33 10HmbC-0005vi-00 => >ph10,abcd <ph10@???> R=forwardfile T=address_reply
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=327
1999-03-02 09:44:33 10HmbE-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
@@ -30,5 +30,5 @@
1999-03-02 09:44:33 10HmbF-0005vi-00 => :blackhole: <abcd@???> R=abcd
1999-03-02 09:44:33 10HmbF-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 => >ph10@???, abcd@??? <ph10@???> R=forwardfile T=address_reply
+1999-03-02 09:44:33 10HmbE-0005vi-00 => >ph10@???,abcd@??? <ph10@???> R=forwardfile T=address_reply
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
Index: 079
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/079,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 079 1 Aug 2005 15:01:13 -0000 1.4
+++ 079 11 Nov 2005 10:02:04 -0000 1.5
@@ -88,7 +88,7 @@
1999-03-02 09:44:33 10HmbR-0005vi-00 "On vacation" first delivery
1999-03-02 09:44:33 10HmbR-0005vi-00 => ph10 <ph10@???> R=localuser T=appendfile
1999-03-02 09:44:33 10HmbR-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbQ-0005vi-00 => >Philip Hazel <ph10@???> <filter-vacation@???> R=userfilter T=address_reply
+1999-03-02 09:44:33 10HmbQ-0005vi-00 => >ph10@??? <filter-vacation@???> R=userfilter T=address_reply
1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmbA-0005vi-00 Message is frozen
Index: 167
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/167,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 167 14 Oct 2004 11:16:36 -0000 1.2
+++ 167 11 Nov 2005 10:02:04 -0000 1.3
@@ -1,14 +1,14 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=265
1999-03-02 09:44:33 10HmaX-0005vi-00 original recipients ignored (system filter)
1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/showenv $recipients <system-filter> T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2107
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2108
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=user T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=247
1999-03-02 09:44:33 10HmaZ-0005vi-00 original recipients ignored (system filter)
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv $recipients <system-filter> T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2105
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2106
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=user T=local_delivery
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
Index: 168
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/168,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 168 14 Oct 2004 11:16:36 -0000 1.2
+++ 168 11 Nov 2005 10:02:04 -0000 1.3
@@ -1,14 +1,14 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=265
1999-03-02 09:44:33 10HmaX-0005vi-00 original recipients ignored (system filter)
1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/showenv $recipients <system-filter> T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2107
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2108
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=user T=local_delivery
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=247
1999-03-02 09:44:33 10HmaZ-0005vi-00 original recipients ignored (system filter)
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv $recipients <system-filter> T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2109
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2110
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=user T=local_delivery
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
Index: 256
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/256,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 256 28 Apr 2005 13:06:33 -0000 1.2
+++ 256 11 Nov 2005 10:02:04 -0000 1.3
@@ -8,7 +8,7 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=257
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv <|/source/exim4/AutoTest/showenv@???> R=allowed T=address_pipe: return message generated
1999-03-02 09:44:33 10HmaZ-0005vi-00 => /source/exim4/AutoTest/test-mail/file </source/exim4/AutoTest/test-mail/file@???> R=allowed T=address_file
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2229
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2230
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=bounces T=local_delivery
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
Index: 270
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/270,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 270 8 Oct 2004 14:49:31 -0000 1.1
+++ 270 11 Nov 2005 10:02:04 -0000 1.2
@@ -8,7 +8,7 @@
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=257
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv <|/source/exim4/AutoTest/showenv@???> R=allowed T=address_pipe: return message generated
1999-03-02 09:44:33 10HmaZ-0005vi-00 => /source/exim4/AutoTest/test-mail/file </source/exim4/AutoTest/test-mail/file@???> R=allowed T=address_file
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2131
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2132
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=bounces T=local_delivery
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
Index: 284
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/284,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 284 8 Oct 2004 14:49:31 -0000 1.1
+++ 284 11 Nov 2005 10:02:04 -0000 1.2
@@ -2,5 +2,5 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=ph10 P=local S=553
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=d2 T=t1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaX-0005vi-00 => >Philip Hazel <ph10@???> <filter@???> R=d1 T=t2
+1999-03-02 09:44:33 10HmaX-0005vi-00 => >ph10@??? <filter@???> R=d1 T=t2
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 439
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/439,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 439 8 Oct 2004 14:49:31 -0000 1.1
+++ 439 11 Nov 2005 10:02:04 -0000 1.2
@@ -3,7 +3,7 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=ph10 P=local S=423
1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <ph10@???> R=bounce
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaX-0005vi-00 => >Philip Hazel <ph10@???> <aaaa@???> R=aaaa T=t3
+1999-03-02 09:44:33 10HmaX-0005vi-00 => >ph10@??? <aaaa@???> R=aaaa T=t3
1999-03-02 09:44:33 10HmaX-0005vi-00 => |/bin/sh -c exit <aaaa@???> R=aaaa T=t2
1999-03-02 09:44:33 10HmaX-0005vi-00 => /source/exim4/AutoTest/test-mail/file <aaaa@???> R=aaaa T=t1
1999-03-02 09:44:33 Start queue run: pid=pppp -qf
Index: 444
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/444,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 444 14 Oct 2004 11:16:36 -0000 1.2
+++ 444 11 Nov 2005 10:02:04 -0000 1.3
@@ -1,20 +1,20 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=272
1999-03-02 09:44:33 10HmaX-0005vi-00 original recipients ignored (system filter)
1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/showenv $thisaddress $1 <system-filter> T=t1: return message generated
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2126
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2127
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=r1 T=t2
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=284
1999-03-02 09:44:33 10HmaZ-0005vi-00 original recipients ignored (system filter)
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv $1 <system-filter> T=t1: return message generated
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2106
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2107
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=r1 T=t2
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=276
1999-03-02 09:44:33 10HmbB-0005vi-00 ** |/source/exim4/AutoTest/showenv $thisaddress $1 <redking@???> R=r0 T=t1: return message generated
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=2116
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=2117
1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=r1 T=t2
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
Index: 470
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/470,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 470 8 Oct 2004 14:49:31 -0000 1.1
+++ 470 11 Nov 2005 10:02:04 -0000 1.2
@@ -2,5 +2,5 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=ph10 P=local S=10197
1999-03-02 09:44:33 10HmaY-0005vi-00 => sender <sender@???> R=r1 T=t2
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaX-0005vi-00 => >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@??? <mug99@???> R=r2 T=t1
+1999-03-02 09:44:33 10HmaX-0005vi-00 => >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ... <mug99@???> R=r2 T=t1
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 024.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/024.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 024.ph10 14 Oct 2004 11:16:36 -0000 1.2
+++ 024.ph10 11 Nov 2005 10:02:04 -0000 1.3
@@ -47,7 +47,7 @@
LOCAL_PART_SUFFIX=
COLON=:
USER=pipe
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -57,7 +57,7 @@
ME=pipe
LOGNAME=pipe
LOCAL_PART=pipe
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
@@ -132,7 +132,7 @@
LOCAL_PART_SUFFIX=
COLON=:
USER=pipe
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -142,7 +142,7 @@
ME=pipe
LOGNAME=pipe
LOCAL_PART=pipe
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
@@ -217,7 +217,7 @@
LOCAL_PART_SUFFIX=-suffixed
COLON=:
USER=pipe
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -227,7 +227,7 @@
ME=pipe
LOGNAME=pipe
LOCAL_PART=pipe
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
@@ -302,7 +302,7 @@
LOCAL_PART_SUFFIX=-suffixed
COLON=:
USER=pipe
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -312,7 +312,7 @@
ME=pipe
LOGNAME=pipe
LOCAL_PART=pipe
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
@@ -387,7 +387,7 @@
LOCAL_PART_SUFFIX=
COLON=:
USER=pipe
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -397,7 +397,7 @@
ME=pipe
LOGNAME=pipe
LOCAL_PART=pipe
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
Index: 167.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/167.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 167.ph10 14 Oct 2004 11:16:36 -0000 1.2
+++ 167.ph10 11 Nov 2005 10:02:04 -0000 1.3
@@ -41,7 +41,7 @@
SHELL=/bin/sh
LOCAL_PART_SUFFIX=
USER=system-filter
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -50,7 +50,7 @@
HOME=
LOGNAME=system-filter
LOCAL_PART=system-filter
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
@@ -117,7 +117,7 @@
SHELL=/bin/sh
LOCAL_PART_SUFFIX=
USER=system-filter
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -126,7 +126,7 @@
HOME=
LOGNAME=system-filter
LOCAL_PART=system-filter
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
Index: 168.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/168.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 168.ph10 14 Oct 2004 11:16:36 -0000 1.2
+++ 168.ph10 11 Nov 2005 10:02:04 -0000 1.3
@@ -41,7 +41,7 @@
SHELL=/bin/sh
LOCAL_PART_SUFFIX=
USER=system-filter
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
DOMAIN=test.ex
QUALIFY_DOMAIN=test.ex
@@ -50,7 +50,7 @@
SHLVL=2
LOCAL_PART=system-filter
LOGNAME=system-filter
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
@@ -119,7 +119,7 @@
SHELL=/bin/sh
LOCAL_PART_SUFFIX=
USER=system-filter
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
DOMAIN=test.ex
QUALIFY_DOMAIN=test.ex
@@ -128,7 +128,7 @@
SHLVL=2
LOCAL_PART=system-filter
LOGNAME=system-filter
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
Index: 256.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/256.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 256.ph10 28 Apr 2005 13:06:34 -0000 1.2
+++ 256.ph10 11 Nov 2005 10:02:04 -0000 1.3
@@ -74,7 +74,7 @@
SHELL=/bin/sh
LOCAL_PART_SUFFIX=
USER=|/source/exim4/AutoTest/showenv
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=yes.test.ex
@@ -84,7 +84,7 @@
HOME=
LOGNAME=|/source/exim4/AutoTest/showenv
LOCAL_PART=|/source/exim4/AutoTest/showenv
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
Index: 270.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/270.ph10,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 270.ph10 8 Oct 2004 14:49:42 -0000 1.1
+++ 270.ph10 11 Nov 2005 10:02:04 -0000 1.2
@@ -71,7 +71,7 @@
SHELL=/bin/sh
LOCAL_PART_SUFFIX=
USER=|/source/exim4/AutoTest/showenv
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=yes.test.ex
@@ -80,7 +80,7 @@
HOME=
LOGNAME=|/source/exim4/AutoTest/showenv
LOCAL_PART=|/source/exim4/AutoTest/showenv
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by xoanon.csi.cam.ac.uk with local (Exim x.yz)
Index: 444.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/444.ph10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 444.ph10 14 Oct 2004 11:16:36 -0000 1.2
+++ 444.ph10 11 Nov 2005 10:02:04 -0000 1.3
@@ -42,7 +42,7 @@
SHELL=/bin/sh
LOCAL_PART_SUFFIX=
USER=system-filter
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -51,7 +51,7 @@
HOME=
LOGNAME=system-filter
LOCAL_PART=system-filter
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
@@ -120,7 +120,7 @@
SHELL=/bin/sh
LOCAL_PART_SUFFIX=
USER=system-filter
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -129,7 +129,7 @@
HOME=
LOGNAME=system-filter
LOCAL_PART=system-filter
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
@@ -199,7 +199,7 @@
SHELL=/bin/sh
LOCAL_PART_SUFFIX=
USER=redking
-PATH=/usr/bin
+PATH=/bin:/usr/bin
PWD=/
QUALIFY_DOMAIN=test.ex
DOMAIN=test.ex
@@ -208,7 +208,7 @@
HOME=
LOGNAME=redking
LOCAL_PART=redking
-_=/usr/bin/env
+_=/bin/env
----------cat-----------
>From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
Index: 353
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/353,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 353 22 Aug 2005 15:28:20 -0000 1.2
+++ 353 11 Nov 2005 10:02:04 -0000 1.3
@@ -72,7 +72,7 @@
SMTP<< EHLO [IPV6:2002:c1ed:8229:10:202:2dff:fe07:a42a]
[IPV6:2002:c1ed:8229:10:202:2dff:fe07:a42a] in helo_lookup_domains? no (end of list)
sender_fullhost = ([IPV6:2002:c1ed:8229:10:202:2dff:fe07:a42a]) [2002:c1ed:8229:0010:0202:2dff:fe07:a42a]
-sender_rcvhost = [2002:c1ed:8229:0010:0202:2dff:fe07:a42a] (helo=[IPV6:2002:c1ed:8229:10:202:2dff:fe07:a42a])
+sender_rcvhost = [2002:c1ed:8229:0010:0202:2dff:fe07:a42a]
set_process_info: 21680 handling incoming connection from ([IPV6:2002:c1ed:8229:10:202:2dff:fe07:a42a]) [2002:c1ed:8229:0010:0202:2dff:fe07:a42a]
host in pipelining_advertise_hosts? yes (matched "*")
host in tls_advertise_hosts? no (option unset)
@@ -96,14 +96,14 @@
Data file written for message 10HmaX-0005vi-00
>>Generated Received: header line
-P Received: from [2002:c1ed:8229:0010:0202:2dff:fe07:a42a] (helo=[IPV6:2002:c1ed:8229:10:202:2dff:fe07:a42a])
+P Received: from [2002:c1ed:8229:0010:0202:2dff:fe07:a42a]
by myhost.test.ex with esmtp (Exim x.yz)
id 10HmaX-0005vi-00
for x@y; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
- <= <> H=([IPV6:2002:c1ed:8229:10:202:2dff:fe07:a42a]) [2002:c1ed:8229:0010:0202:2dff:fe07:a42a] P=esmtp S=214
+ <= <> H=([IPV6:2002:c1ed:8229:10:202:2dff:fe07:a42a]) [2002:c1ed:8229:0010:0202:2dff:fe07:a42a] P=esmtp S=163
SMTP>> 250 OK id=10HmaX-0005vi-00
smtp_setup_msg entered
SMTP<< quit
@@ -145,7 +145,7 @@
SMTP<< EHLO [1.2.3.4]
[1.2.3.4] in helo_lookup_domains? no (end of list)
sender_fullhost = ([1.2.3.4]) [1.2.3.4]
-sender_rcvhost = [1.2.3.4] (helo=[1.2.3.4])
+sender_rcvhost = [1.2.3.4]
set_process_info: 21680 handling incoming connection from ([1.2.3.4]) [1.2.3.4]
host in pipelining_advertise_hosts? yes (matched "*")
host in tls_advertise_hosts? no (option unset)
@@ -169,14 +169,14 @@
Data file written for message 10HmaY-0005vi-00
>>Generated Received: header line
-P Received: from [1.2.3.4] (helo=[1.2.3.4])
+P Received: from [1.2.3.4]
by myhost.test.ex with esmtp (Exim x.yz)
id 10HmaY-0005vi-00
for x@y; Tue, 2 Mar 1999 09:44:33 +0000
calling local_scan(); timeout=300
local_scan() returned 0 NULL
LOG: MAIN
- <= <> H=([1.2.3.4]) [1.2.3.4] P=esmtp S=148
+ <= <> H=([1.2.3.4]) [1.2.3.4] P=esmtp S=131
SMTP>> 250 OK id=10HmaY-0005vi-00
smtp_setup_msg entered
SMTP<< quit
Index: 439
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/439,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 439 1 Aug 2005 13:20:29 -0000 1.3
+++ 439 11 Nov 2005 10:02:04 -0000 1.4
@@ -58,7 +58,7 @@
Filter: end of processing
rda_interpret: subprocess yield=0 error=NULL
set transport t3
-aaaa router generated >Philip Hazel <ph10@???>
+aaaa router generated >ph10@???
pipe, file, or autoreply
errors_to=NULL transport=t3
uid=1169 gid=1169 home=NULL
@@ -93,8 +93,8 @@
unique = |/bin/sh -c exit:aaaa@???
queued for t2 transport
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-Considering: >Philip Hazel <ph10@???>
-unique = >Philip Hazel <ph10@???>:aaaa@???
+Considering: >ph10@???
+unique = >ph10@???:aaaa@???
queued for t3 transport
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing defer_aaaa@???
@@ -118,7 +118,7 @@
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
After routing:
Local deliveries:
- >Philip Hazel <ph10@???>
+ >ph10@???
|/bin/sh -c exit
/source/exim4/AutoTest/test-mail/file
Remote deliveries:
@@ -174,7 +174,7 @@
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
- => >Philip Hazel <ph10@???> <aaaa@???> R=aaaa T=t3
+ => >ph10@??? <aaaa@???> R=aaaa T=t3
locking /source/exim4/AutoTest/spool/db/retry.lockfile
transport error EPIPE ignored
LOG: MAIN
@@ -263,7 +263,7 @@
Filter: end of processing
rda_interpret: subprocess yield=0 error=NULL
set transport t3
-aaaa router generated >Philip Hazel <ph10@???>
+aaaa router generated >ph10@???
pipe, file, or autoreply
errors_to=NULL transport=t3
uid=1169 gid=1169 home=NULL
@@ -297,9 +297,9 @@
unique = |/bin/sh -c exit:aaaa@???
|/bin/sh -c exit was previously delivered: discarded
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-Considering: >Philip Hazel <ph10@???>
-unique = >Philip Hazel <ph10@???>:aaaa@???
->Philip Hazel <ph10@???> was previously delivered: discarded
+Considering: >ph10@???
+unique = >ph10@???:aaaa@???
+>ph10@??? was previously delivered: discarded
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing defer_aaaa@???
--------> bounce router <--------
Index: 470
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/470,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- 470 2 Aug 2005 15:19:20 -0000 1.9
+++ 470 11 Nov 2005 10:02:04 -0000 1.10
@@ -201,7 +201,7 @@
search_tidyup called
rda_interpret: subprocess yield=0 error=NULL
set transport t1
-r2 router generated >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???
+r2 router generated >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
pipe, file, or autoreply
errors_to=NULL transport=t1
uid=1169 gid=1169 home=NULL
@@ -214,26 +214,26 @@
returned from EXIM_DBOPEN
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-Considering: >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???
-unique = >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???:mug99@???
+Considering: >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
+unique = >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...:mug99@???
queued for t1 transport
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
After routing:
Local deliveries:
- >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???
+ >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
Remote deliveries:
Failed addresses:
Deferred addresses:
search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
---------> >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@??? <--------
+--------> >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ... <--------
locking /source/exim4/AutoTest/spool/db/retry.lockfile
locked /source/exim4/AutoTest/spool/db/retry.lockfile
EXIM_DBOPEN(/source/exim4/AutoTest/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
search_tidyup called
-changed uid/gid: local delivery to >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@??? <>sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???> transport=t1
+changed uid/gid: local delivery to >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ... <>sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...> transport=t1
uid=1169 gid=1169 pid=pppp
auxiliary group list: 4 10 18 19 42 100 250 1169 2194
home=NULL current=/
@@ -15586,13 +15586,13 @@
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
t1 transport succeeded
search_tidyup called
-journalling >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???:mug99@???
-t1 transport returned OK for >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???
-post-process >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@??? (0)
->sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@??? delivered
+journalling >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...:mug99@???
+t1 transport returned OK for >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...
+post-process >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ... (0)
+>sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ... delivered
mug99@???: children all complete
LOG: MAIN
- => >sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@??? <mug99@???> R=r2 T=t1
+ => >sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ... <mug99@???> R=r2 T=t1
>>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
changed uid/gid: post-delivery tidying
uid=42 gid=42 pid=pppp
@@ -15600,7 +15600,7 @@
set_process_info: 21680 tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
->sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???, sender@???: no retry items
+>sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???,sender@???, ...: no retry items
mug99@???: no retry items
mug99@???: no retry items
Failed addresses:
Index: 559
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/559,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 559 1 Aug 2005 13:20:29 -0000 1.2
+++ 559 11 Nov 2005 10:02:04 -0000 1.3
@@ -30,7 +30,7 @@
SMTP<< helo [1.2.3.4]
[1.2.3.4] in helo_lookup_domains? no (end of list)
sender_fullhost = ([1.2.3.4]) [1.2.3.4]
-sender_rcvhost = [1.2.3.4] (helo=[1.2.3.4])
+sender_rcvhost = [1.2.3.4]
set_process_info: 21680 handling incoming connection from ([1.2.3.4]) [1.2.3.4]
SMTP>> 250 xoanon.csi.cam.ac.uk Hello [1.2.3.4] [1.2.3.4]
SMTP<< mail from:<a@b>
Index: 001
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/001,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- 001 8 Aug 2005 13:21:46 -0000 1.16
+++ 001 11 Nov 2005 10:02:05 -0000 1.17
@@ -910,7 +910,7 @@
max_output = 20K
message_prefix = From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
message_suffix = \n
-path = /usr/bin
+path = /bin:/usr/bin
no_pipe_as_creator
no_restrict_to_path
no_return_fail_output
Index: 002
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/002,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- 002 8 Aug 2005 13:21:46 -0000 1.13
+++ 002 11 Nov 2005 10:02:05 -0000 1.14
@@ -872,7 +872,7 @@
max_output = 20K
message_prefix = From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n
message_suffix = \n
-path = /usr/bin
+path = /bin:/usr/bin
no_pipe_as_creator
no_restrict_to_path
no_return_fail_output
Index: 439
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/439,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 439 8 Oct 2004 14:50:13 -0000 1.1
+++ 439 11 Nov 2005 10:02:05 -0000 1.2
@@ -10,7 +10,7 @@
-allow_unqualified_recipient
-allow_unqualified_sender
-local
-YY >Philip Hazel <ph10@???>:aaaa@???
+YY >ph10@???:aaaa@???
NN /source/exim4/AutoTest/test-mail/file:aaaa@???
NN |/bin/sh -c exit:aaaa@???
1
