jetmore 2010/06/05 03:25:16 BST
Modified files:
exim-test runtest
exim-test/stderr 0563
Log:
munge caller's GECOS in output to make more portable across test accounts
Revision Changes Path
1.36 +4 -3 exim/exim-test/runtest
1.2 +1 -1 exim/exim-test/stderr/0563
Index: runtest
===================================================================
RCS file: /home/cvs/exim/exim-test/runtest,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- runtest 5 Jun 2010 01:58:39 -0000 1.35
+++ runtest 5 Jun 2010 02:25:16 -0000 1.36
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
-# $Cambridge: exim/exim-test/runtest,v 1.35 2010/06/05 01:58:39 jetmore Exp $
+# $Cambridge: exim/exim-test/runtest,v 1.36 2010/06/05 02:25:16 jetmore Exp $
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@ -441,7 +441,7 @@
\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Exim statistics from <time> to <time>/x;
- # ======== Caller's login, uid, gid, home ========
+ # ======== Caller's login, uid, gid, home, gecos ========
s/\Q$parm_caller_home\E/CALLER_HOME/g; # NOTE: these must be done
s/\b\Q$parm_caller\E\b/CALLER/g; # in this order!
@@ -453,6 +453,8 @@
s/\buid=$parm_caller_uid\b/uid=CALLER_UID/g;
s/\bgid=$parm_caller_gid\b/gid=CALLER_GID/g;
+ s/\bname=$parm_caller_gecos\b/name=CALLER_GECOS/g;
+
# When looking at spool files with -Mvh, we will find not only the caller
# login, but also the uid and gid. It seems that $) in some Perls gives all
# the auxiliary gids as well, so don't bother checking for that.
@@ -2367,12 +2369,11 @@
# Find the caller of this program.
($parm_caller,$pwpw,$parm_caller_uid,$parm_caller_gid,$pwquota,$pwcomm,
- $pwgecos, $parm_caller_home) = getpwuid($>);
+ $parm_caller_gecos, $parm_caller_home) = getpwuid($>);
$pwpw = $pwpw; # Kill Perl warnings
$pwquota = $pwquota;
$pwcomm = $pwcomm;
-$pwgecos = $pwgecos;
$parm_caller_group = getgrgid($parm_caller_gid);
Index: 0563
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0563,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0563 7 Feb 2008 18:20:46 -0000 1.1
+++ 0563 5 Jun 2010 02:25:16 -0000 1.2
@@ -5,7 +5,7 @@
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=Exim Test Suite
+originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_GECOS
sender address = CALLER@???
Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
