summaryrefslogtreecommitdiff
path: root/test/runtest
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2007-03-14 12:15:56 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2007-03-14 12:15:56 +0000
commitebeaf99687d0fd6545c95983f0d91e2ddee7fbb7 (patch)
treea10d870a11a5a2d0c05254a7b040cb80c99d2fd2 /test/runtest
parentcd9868ec7872447f31efd5f175c7f3e90ac92657 (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/runtest')
-rwxr-xr-xtest/runtest11
1 files changed, 7 insertions, 4 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