Testsuite: avoid one fixed UID

This gets us out of a hole on one test system which had UID 1234 in use;
it is not a full fix as we also (try to) use 5768.

diff --git a/test/aux-fixed/0001.trusted b/test/aux-fixed/0001.trusted
deleted file mode 100644 (file)
index ae8c4c1..0000000
--- a/test/aux-fixed/0001.trusted
+++ /dev/null
@@ -1,2 +0,0 @@
-1234
-5678

diff --git a/test/aux-var-src/0001.trusted b/test/aux-var-src/0001.trusted
new file mode 100644 (file)
index 0000000..a7216a6
--- /dev/null
+++ b/test/aux-var-src/0001.trusted
@@ -0,0 +1,2 @@
+CALLER_UID
+5678

diff --git a/test/confs/0001 b/test/confs/0001
index fc2ae3eaf4d1f7b6e4b597d6030c6d40b2e0d55f..4dfd09aeacbca3eaf4008856538cffdfa47211fc 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -208,7 +208,7 @@ timeout_frozen_after = 7d
 timezone = EDT
 tls_advertise_hosts =
 trusted_groups = 42
 timezone = EDT
 tls_advertise_hosts =
 trusted_groups = 42

-trusted_users = ${readfile{DIR/aux-fixed/TESTNUM.trusted}{:}}
+trusted_users = ${readfile{DIR/aux-var/TESTNUM.trusted}{:}}

 unknown_login = unknownlogin
 unknown_username = Exim Testing
 untrusted_set_sender = *
 unknown_login = unknownlogin
 unknown_username = Exim Testing
 untrusted_set_sender = *

diff --git a/test/stdout/0001 b/test/stdout/0001
index 9238c91fe11e3cdf6b8c8f790dacc1291459b89b..adb605fd4ee25d2000f30bfcc41796e87c73f778 100644 (file)
--- a/test/stdout/0001
+++ b/test/stdout/0001
@@ -17,7 +17,7 @@ retry_interval_max = 1d
 receive_timeout = 0s
 sender_unqualified_hosts = localhost:some.host.name
 no_tcp_nodelay
 receive_timeout = 0s
 sender_unqualified_hosts = localhost:some.host.name
 no_tcp_nodelay

-trusted_users = 1234:5678
+trusted_users = CALLER:5678

 unknown_login = unknownlogin
 warn_message_file = /home/exim/test/warnmsg_file
 no_syslog_pid
 unknown_login = unknownlogin
 warn_message_file = /home/exim/test/warnmsg_file
 no_syslog_pid