diff options
author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-03-14 12:15:56 +0000 |
---|---|---|
committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-03-14 12:15:56 +0000 |
commit | ebeaf99687d0fd6545c95983f0d91e2ddee7fbb7 (patch) | |
tree | a10d870a11a5a2d0c05254a7b040cb80c99d2fd2 /test | |
parent | cd9868ec7872447f31efd5f175c7f3e90ac92657 (diff) |
Change originator_xxx fields in the daemon when it gives up root so that
the -H files are always consistent.
Diffstat (limited to 'test')
-rwxr-xr-x | test/runtest | 11 | ||||
-rw-r--r-- | test/stdout/0035 | 14 | ||||
-rw-r--r-- | test/stdout/3415 | 10 |
3 files changed, 19 insertions, 16 deletions
diff --git a/test/runtest b/test/runtest index 4e511dc36..472aeaf78 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.24 2007/02/08 15:16:19 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.25 2007/03/14 12:15:56 ph10 Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -463,9 +463,10 @@ while(<IN>) # ======== Exim's login ======== - # For bounce messages, this will appear on the U= lines in logs and also - # after Received: and in addresses. In one pipe test it appears after - # "Running as:". It also appears in addresses, and in the names of lock + # For messages received by the daemon, this is in the -H file, which some + # tests inspect. For bounce messages, this will appear on the U= lines in + # logs and also after Received: and in addresses. In one pipe test it appears + # after "Running as:". It also appears in addresses, and in the names of lock # files. s/U=$parm_eximuser/U=EXIMUSER/; @@ -482,6 +483,8 @@ while(<IN>) s/\buid=$parm_exim_uid\b/uid=EXIM_UID/g; s/\bgid=$parm_exim_gid\b/gid=EXIM_GID/g; + s/^$parm_eximuser $parm_exim_uid $parm_exim_gid/EXIMUSER EXIM_UID EXIM_GID/; + # ======== General uids, gids, and pids ======== # Note: this must come after munges for caller's and exim's uid/gid diff --git a/test/stdout/0035 b/test/stdout/0035 index dfc44ed51..15cac0b0f 100644 --- a/test/stdout/0035 +++ b/test/stdout/0035 @@ -135,7 +135,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 221 myhost.test.ex closing connection End of script 10HmaX-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <notsubmit@y> ddddddddd 0 -helo_name rhu.barb @@ -154,7 +154,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 10HmaY-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 -helo_name rhu.barb @@ -176,7 +176,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) dddF From: a@y 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmaZ-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -helo_name rhu.barb @@ -196,7 +196,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbA-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <notsubmit@y> ddddddddd 0 -helo_name rhu.barb @@ -216,7 +216,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) for x@y; Tue, 2 Mar 1999 09:44:33 +0000 dddS Sender: sender@some.where 10HmbB-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 -helo_name rhu.barb @@ -239,7 +239,7 @@ ddd* Sender: sender@some.where dddF From: a@y 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbC-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 -helo_name rhu.barb @@ -262,7 +262,7 @@ dddS Sender: sender@some.where dddF From: a@y 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbD-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 -helo_name rhu.barb diff --git a/test/stdout/3415 b/test/stdout/3415 index 8cfc49d37..bc9555c02 100644 --- a/test/stdout/3415 +++ b/test/stdout/3415 @@ -144,7 +144,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 221 myhost.test.ex closing connection End of script 10HmaX-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <username@myhost.test.ex> ddddddddd 0 -helo_name rhu.barb @@ -169,7 +169,7 @@ dddF From: a@y dddS Sender: username@myhost.test.ex 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmaY-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -helo_name rhu.barb @@ -192,7 +192,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) dddF From: username@myhost.test.ex 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmaZ-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -helo_name rhu.barb @@ -215,7 +215,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) dddF From: username@another.domain 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbA-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -helo_name rhu.barb @@ -238,7 +238,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb) dddF From: username@auth.id.domain 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 10HmbB-0005vi-00-H -CALLER UID GID +EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 -helo_name rhu.barb |