diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-12-15 15:03:47 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-12-15 16:02:42 +0000 |
| commit | 46017bad89b849137b4b327db699fdc6f63ffbec (patch) | |
| tree | 609ca54489c2dbf11202c1731a3cd644a4b2041a | |
| parent | 3b3e6617a45743290ff2428d9a23ab77e137886b (diff) | |
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.
| -rw-r--r-- | test/aux-fixed/0001.trusted | 2 | ||||
| -rw-r--r-- | test/aux-var-src/0001.trusted | 2 | ||||
| -rw-r--r-- | test/confs/0001 | 2 | ||||
| -rw-r--r-- | test/stdout/0001 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/aux-fixed/0001.trusted b/test/aux-fixed/0001.trusted deleted file mode 100644 index ae8c4c1e5..000000000 --- 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 index 000000000..a7216a683 --- /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 fc2ae3eaf..4dfd09aea 100644 --- a/test/confs/0001 +++ b/test/confs/0001 @@ -208,7 +208,7 @@ timeout_frozen_after = 7d 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 = * diff --git a/test/stdout/0001 b/test/stdout/0001 index 9238c91fe..adb605fd4 100644 --- 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 -trusted_users = 1234:5678 +trusted_users = CALLER:5678 unknown_login = unknownlogin warn_message_file = /home/exim/test/warnmsg_file no_syslog_pid |