git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5de15b
)
Debug: remove router DSN config dump on startup
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 11 Nov 2017 21:04:21 +0000
(21:04 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 11 Nov 2017 21:04:21 +0000
(21:04 +0000)
61 files changed:
src/src/route.c
patch
|
blob
|
history
test/stderr/0022
patch
|
blob
|
history
test/stderr/0037
patch
|
blob
|
history
test/stderr/0078
patch
|
blob
|
history
test/stderr/0084
patch
|
blob
|
history
test/stderr/0085
patch
|
blob
|
history
test/stderr/0092
patch
|
blob
|
history
test/stderr/0094
patch
|
blob
|
history
test/stderr/0117
patch
|
blob
|
history
test/stderr/0123
patch
|
blob
|
history
test/stderr/0149
patch
|
blob
|
history
test/stderr/0161
patch
|
blob
|
history
test/stderr/0183
patch
|
blob
|
history
test/stderr/0275
patch
|
blob
|
history
test/stderr/0278
patch
|
blob
|
history
test/stderr/0279
patch
|
blob
|
history
test/stderr/0297
patch
|
blob
|
history
test/stderr/0315
patch
|
blob
|
history
test/stderr/0332
patch
|
blob
|
history
test/stderr/0333
patch
|
blob
|
history
test/stderr/0360
patch
|
blob
|
history
test/stderr/0361
patch
|
blob
|
history
test/stderr/0362
patch
|
blob
|
history
test/stderr/0364
patch
|
blob
|
history
test/stderr/0374
patch
|
blob
|
history
test/stderr/0375
patch
|
blob
|
history
test/stderr/0377
patch
|
blob
|
history
test/stderr/0378
patch
|
blob
|
history
test/stderr/0379
patch
|
blob
|
history
test/stderr/0380
patch
|
blob
|
history
test/stderr/0386
patch
|
blob
|
history
test/stderr/0388
patch
|
blob
|
history
test/stderr/0391
patch
|
blob
|
history
test/stderr/0398
patch
|
blob
|
history
test/stderr/0399
patch
|
blob
|
history
test/stderr/0402
patch
|
blob
|
history
test/stderr/0403
patch
|
blob
|
history
test/stderr/0404
patch
|
blob
|
history
test/stderr/0408
patch
|
blob
|
history
test/stderr/0414
patch
|
blob
|
history
test/stderr/0419
patch
|
blob
|
history
test/stderr/0426
patch
|
blob
|
history
test/stderr/0432
patch
|
blob
|
history
test/stderr/0463
patch
|
blob
|
history
test/stderr/0464
patch
|
blob
|
history
test/stderr/0469
patch
|
blob
|
history
test/stderr/0479
patch
|
blob
|
history
test/stderr/0483
patch
|
blob
|
history
test/stderr/0487
patch
|
blob
|
history
test/stderr/0499
patch
|
blob
|
history
test/stderr/0543
patch
|
blob
|
history
test/stderr/0545
patch
|
blob
|
history
test/stderr/0563
patch
|
blob
|
history
test/stderr/2201
patch
|
blob
|
history
test/stderr/2600
patch
|
blob
|
history
test/stderr/3210
patch
|
blob
|
history
test/stderr/3400
patch
|
blob
|
history
test/stderr/5004
patch
|
blob
|
history
test/stderr/5005
patch
|
blob
|
history
test/stderr/5006
patch
|
blob
|
history
test/stderr/5204
patch
|
blob
|
history
diff --git
a/src/src/route.c
b/src/src/route.c
index c112169f79cdeb530ec91d011fc4a3b07c2ce16e..83cf468b0f5820daebcab48f38983c9e6ca36b9d 100644
(file)
--- a/
src/src/route.c
+++ b/
src/src/route.c
@@
-244,14
+244,12
@@
for (r = routers; r; r = r->next)
/* Check for transport or no transport on certain routers */
/* Check for transport or no transport on certain routers */
- if ((r->info->ri_flags & ri_yestransport) != 0 &&
- r->transport_name == NULL &&
- !r->verify_only)
+ if ( (r->info->ri_flags & ri_yestransport)
+ && !r->transport_name && !r->verify_only)
log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "%s router:\n "
"a transport is required for this router", r->name);
log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "%s router:\n "
"a transport is required for this router", r->name);
- if ((r->info->ri_flags & ri_notransport) != 0 &&
- r->transport_name != NULL)
+ if ((r->info->ri_flags & ri_notransport) && r->transport_name)
log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "%s router:\n "
"a transport must not be defined for this router", r->name);
log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "%s router:\n "
"a transport must not be defined for this router", r->name);
@@
-292,14
+290,16
@@
for (r = routers; r; r = r->next)
/* Check redirect_router and pass_router are valid */
/* Check redirect_router and pass_router are valid */
- if (r->redirect_router_name
!= NULL
)
+ if (r->redirect_router_name)
set_router(r, r->redirect_router_name, &(r->redirect_router), FALSE);
set_router(r, r->redirect_router_name, &(r->redirect_router), FALSE);
- if (r->pass_router_name
!= NULL
)
+ if (r->pass_router_name)
set_router(r, r->pass_router_name, &(r->pass_router), TRUE);
set_router(r, r->pass_router_name, &(r->pass_router), TRUE);
+#ifdef notdef
DEBUG(D_route) debug_printf("DSN: %s %s\n", r->name,
r->dsn_lasthop ? "lasthop set" : "propagating DSN");
DEBUG(D_route) debug_printf("DSN: %s %s\n", r->name,
r->dsn_lasthop ? "lasthop set" : "propagating DSN");
+#endif
}
}
}
}
diff --git
a/test/stderr/0022
b/test/stderr/0022
index ab14c40ceed027e5708454ab57b27be7c15c8a17..c558b4226e1168698e0303621c044433a3c25026 100644
(file)
--- a/
test/stderr/0022
+++ b/
test/stderr/0022
@@
-5,7
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: accept propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-73,7
+72,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: accept propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-144,7
+142,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: accept propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git
a/test/stderr/0037
b/test/stderr/0037
index 1d03f0d480e87ce836680972cece57dada0b1cb5..6889c9f7b0a06c0a301f504a75d5499e29b07de0 100644
(file)
--- a/
test/stderr/0037
+++ b/
test/stderr/0037
@@
-2,24
+2,12
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: check_vars propagating DSN
-DSN: fail_read_filter propagating DSN
-DSN: prepend_filter propagating DSN
-DSN: userfilter propagating DSN
-DSN: user_accept1 propagating DSN
-DSN: user_accept2 propagating DSN
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: check_vars propagating DSN
-DSN: fail_read_filter propagating DSN
-DSN: prepend_filter propagating DSN
-DSN: userfilter propagating DSN
-DSN: user_accept1 propagating DSN
-DSN: user_accept2 propagating DSN
rda_interpret (file): TESTSUITE/aux-var/0037.F
expanded: TESTSUITE/aux-var/0037.F
ssss bytes read from TESTSUITE/aux-var/0037.F
rda_interpret (file): TESTSUITE/aux-var/0037.F
expanded: TESTSUITE/aux-var/0037.F
ssss bytes read from TESTSUITE/aux-var/0037.F
diff --git
a/test/stderr/0078
b/test/stderr/0078
index 3ab49c8202b338e6384e048e5d162ce7cb0f70e1..550e84f10a9376906904ddd95286394c1ed16ff7 100644
(file)
--- a/
test/stderr/0078
+++ b/
test/stderr/0078
@@
-1,9
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: lookuphost propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@mxt6.test.ex
--------> lookuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@mxt6.test.ex
--------> lookuphost router <--------
@@
-25,9
+22,6
@@
routed by lookuphost router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: lookuphost propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing myhost.test.ex@mxt1.test.ex
--------> lookuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing myhost.test.ex@mxt1.test.ex
--------> lookuphost router <--------
@@
-63,9
+57,6
@@
routed by self router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: lookuphost propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@mxt1.test.ex
--------> lookuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@mxt1.test.ex
--------> lookuphost router <--------
@@
-115,9
+106,6
@@
routed by self2 router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: lookuphost propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@not.exist
--------> lookuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@not.exist
--------> lookuphost router <--------
diff --git
a/test/stderr/0084
b/test/stderr/0084
index cda7d1275a02a10b212aae2e5c29d89373c49cfa..4100ebe9ede8ef37120e341a4132a8e23e3ac87d 100644
(file)
--- a/
test/stderr/0084
+++ b/
test/stderr/0084
@@
-1,9
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: smart propagating DSN
-DSN: forward propagating DSN
-DSN: localuser propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing yes@myhost.test.ex
--------> smart router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing yes@myhost.test.ex
--------> smart router <--------
diff --git
a/test/stderr/0085
b/test/stderr/0085
index 32705b79fe344feade9d31e89b227722642d5150..1b9995eb91b4f1acc5da8af74b4014e018e209a9 100644
(file)
--- a/
test/stderr/0085
+++ b/
test/stderr/0085
@@
-5,9
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: smart1 propagating DSN
-DSN: fail_remote_domains propagating DSN
-DSN: smart2 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-207,9
+204,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: smart1 propagating DSN
-DSN: fail_remote_domains propagating DSN
-DSN: smart2 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git
a/test/stderr/0092
b/test/stderr/0092
index d2b3b5c2a7c258a5b6b198425668cff668777871..c06f9deaeb46607342628c55bfc6fe7f09dcdcff 100644
(file)
--- a/
test/stderr/0092
+++ b/
test/stderr/0092
@@
-39,8
+39,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: fail_remote_domains propagating DSN
-DSN: forward propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
sender_fullhost = [V4NET.0.0.1]
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
sender_fullhost = [V4NET.0.0.1]
diff --git
a/test/stderr/0094
b/test/stderr/0094
index efd339bf1b30a47eb6cb3dcca313d6fd19c54645..f612ed36ff9a09b936bb2748db5b7dae85937f9e 100644
(file)
--- a/
test/stderr/0094
+++ b/
test/stderr/0094
@@
-68,7
+68,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: localuser propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git
a/test/stderr/0117
b/test/stderr/0117
index 45325c3d946d25ac28188dd0a68600b07891d664..b4e5e8b2d975160b8e9d50fc1038b1b4bc02eb3d 100644
(file)
--- a/
test/stderr/0117
+++ b/
test/stderr/0117
@@
-1,7
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: lookuphost propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xxx@mxt9.test.ex
--------> lookuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xxx@mxt9.test.ex
--------> lookuphost router <--------
@@
-23,7
+22,6
@@
routed by lookuphost router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: lookuphost propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xxx@mxt9a.test.ex
--------> lookuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xxx@mxt9a.test.ex
--------> lookuphost router <--------
@@
-45,7
+43,6
@@
routed by lookuphost router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: lookuphost propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xxx@mxt9b.test.ex
--------> lookuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xxx@mxt9b.test.ex
--------> lookuphost router <--------
diff --git
a/test/stderr/0123
b/test/stderr/0123
index 6d51d325208094cf87a4ad94f8239a2b531c5e6d..25d6d4e1be7c0525d52c5741c6aa869b874251aa 100644
(file)
--- a/
test/stderr/0123
+++ b/
test/stderr/0123
@@
-3,12
+3,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: l1 propagating DSN
-DSN: l2 propagating DSN
-DSN: l3 propagating DSN
-DSN: c1 propagating DSN
-DSN: c2 propagating DSN
-DSN: c3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/0149
b/test/stderr/0149
index cd4fdd8fc440f5864dc03155d924685978fa3cf8..87a71b52ad46bddd6e68fb70226ca7e440fdf96d 100644
(file)
--- a/
test/stderr/0149
+++ b/
test/stderr/0149
@@
-1,9
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: domainlist1 propagating DSN
-DSN: domainlist2 propagating DSN
-DSN: local propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing x@ten
--------> domainlist1 router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing x@ten
--------> domainlist1 router <--------
diff --git
a/test/stderr/0161
b/test/stderr/0161
index 0147fcb6ff93c119240721d34b35ab358581a97b..6b1f5796b00c8f671acc73df77d76d7765d0be8a 100644
(file)
--- a/
test/stderr/0161
+++ b/
test/stderr/0161
@@
-1,11
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@mxt6.test.ex
--------> failuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@mxt6.test.ex
--------> failuphost router <--------
@@
-32,11
+27,6
@@
routed by lookuphost router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing myhost.test.ex@mxt1.test.ex
--------> failuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing myhost.test.ex@mxt1.test.ex
--------> failuphost router <--------
@@
-82,11
+72,6
@@
routed by self router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@mxt1.test.ex
--------> failuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@mxt1.test.ex
--------> failuphost router <--------
@@
-146,11
+131,6
@@
routed by self2 router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@not.exist
--------> failuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing xx@not.exist
--------> failuphost router <--------
@@
-171,11
+151,6
@@
no more routers
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing ff@mxt1.test.ex
--------> failuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing ff@mxt1.test.ex
--------> failuphost router <--------
@@
-191,11
+166,6
@@
failuphost router forced address failure
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: failuphost propagating DSN
-DSN: lookuphost propagating DSN
-DSN: fail propagating DSN
-DSN: self propagating DSN
-DSN: self2 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing fff@mxt1.test.ex
--------> failuphost router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing fff@mxt1.test.ex
--------> failuphost router <--------
diff --git
a/test/stderr/0183
b/test/stderr/0183
index 35fc1967dbe2acf46f31f1846d570aff1218d906..a12a7f462e08e05e27ee9123a05d65fe556996e1 100644
(file)
--- a/
test/stderr/0183
+++ b/
test/stderr/0183
@@
-3,9
+3,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: srv propagating DSN
-DSN: useryz propagating DSN
-DSN: lookuphost propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@
-196,9
+193,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: srv propagating DSN
-DSN: useryz propagating DSN
-DSN: lookuphost propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@
-387,9
+381,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: srv propagating DSN
-DSN: useryz propagating DSN
-DSN: lookuphost propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@
-580,9
+571,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: srv propagating DSN
-DSN: useryz propagating DSN
-DSN: lookuphost propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/0275
b/test/stderr/0275
index f34132b55bac12241c49a9bb1e7c8e68ebf946f1..4605d64a6a29dd7a1b1c0f66de2c078ed5e4aef4 100644
(file)
--- a/
test/stderr/0275
+++ b/
test/stderr/0275
@@
-5,15
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r00 propagating DSN
-DSN: r01 propagating DSN
-DSN: r02 propagating DSN
-DSN: r03 propagating DSN
-DSN: r04 propagating DSN
-DSN: r05 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@
-115,15
+106,6
@@
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r00 propagating DSN
-DSN: r01 propagating DSN
-DSN: r02 propagating DSN
-DSN: r03 propagating DSN
-DSN: r04 propagating DSN
-DSN: r05 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
@@
-172,15
+154,6
@@
trusted user
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r00 propagating DSN
-DSN: r01 propagating DSN
-DSN: r02 propagating DSN
-DSN: r03 propagating DSN
-DSN: r04 propagating DSN
-DSN: r05 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
@@
-366,16
+339,6
@@
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r0f propagating DSN
-DSN: r00 propagating DSN
-DSN: r01 propagating DSN
-DSN: r02 propagating DSN
-DSN: r03 propagating DSN
-DSN: r04 propagating DSN
-DSN: r05 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
sender_fullhost = [127.0.0.1]
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
sender_fullhost = [127.0.0.1]
diff --git
a/test/stderr/0278
b/test/stderr/0278
index c3a22c0e061e8dfb44a070096cccf249b057cc83..45885d0e3f5ff846ebe943d274ca5486d3fd6e44 100644
(file)
--- a/
test/stderr/0278
+++ b/
test/stderr/0278
@@
-5,11
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@
-70,11
+65,6
@@
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex>
@@
-123,11
+113,6
@@
trusted user
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
@@
-266,11
+251,6
@@
configuration file is TESTSUITE/test-config
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/0279
b/test/stderr/0279
index 7762859fad3ea7d2ec61bf213a9f869a6364aadc..7868f13dca397d28a73b3e9e4933b91e4ebc117d 100644
(file)
--- a/
test/stderr/0279
+++ b/
test/stderr/0279
@@
-8,10
+8,6
@@
trusted user
admin user
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: rr1 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@
-84,10
+80,6
@@
trusted user
admin user
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: rr1 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
sender address = user1@fun.1
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=
sender address = user1@fun.1
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/0297
b/test/stderr/0297
index f5db068eb9a4b97126a82c604cdc9f94a9db0c0b..c2e5c8d358a2dbbecfc8ac1ea81459f5faf8fd69 100644
(file)
--- a/
test/stderr/0297
+++ b/
test/stderr/0297
@@
-2,7
+2,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing /a/b/c@myhost.test.ex
--------> r1 router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing /a/b/c@myhost.test.ex
--------> r1 router <--------
@@
-26,7
+25,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing /x/y/z@myhost.test.ex
--------> r1 router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing /x/y/z@myhost.test.ex
--------> r1 router <--------
diff --git
a/test/stderr/0315
b/test/stderr/0315
index 13db682d309e94ff7f2e09d40b266919f814616f..3501cb502dc942369c69de8315f661e265a8e5a4 100644
(file)
--- a/
test/stderr/0315
+++ b/
test/stderr/0315
@@
-1,8
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
LOG: MAIN
<= CALLER@the.local.host.name U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@the.local.host.name U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-10,8
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
@@
-63,16
+59,12
@@
LOG: MAIN
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
LOG: MAIN
<= CALLER@the.local.host.name U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= CALLER@the.local.host.name U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
delivering 10HmaY-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
delivering 10HmaY-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
diff --git
a/test/stderr/0332
b/test/stderr/0332
index a0072373c23253ee9309c10269a2a30007e95f08..748d0170d8e96905d3a294fc946685da34b05b90 100644
(file)
--- a/
test/stderr/0332
+++ b/
test/stderr/0332
@@
-1,8
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
Start queue run: pid=pppp
locking TESTSUITE/spool/db/retry.lockfile
@@
-43,8
+41,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@test.again.dns
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@test.again.dns
diff --git
a/test/stderr/0333
b/test/stderr/0333
index 8aa3598c0e9aa93c27a53d74c8f55bc6e07f7845..1951d93fe6b22e5858044f9929eac04ce1e46adc 100644
(file)
--- a/
test/stderr/0333
+++ b/
test/stderr/0333
@@
-1,8
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: ok@no.delay
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: ok@no.delay
@@
-42,8
+40,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@test.again.dns
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: delay@test.again.dns
diff --git
a/test/stderr/0360
b/test/stderr/0360
index 0e1710160689ffa1169a5696b3f4ce5ca807a403..2c1aab50bfcd9dca5b4b968a7bf2005b412f09e4 100644
(file)
--- a/
test/stderr/0360
+++ b/
test/stderr/0360
@@
-1,9
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: v0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-11,9
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: v0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
@@
-155,9
+149,6
@@
LOG: MAIN
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: v0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
diff --git
a/test/stderr/0361
b/test/stderr/0361
index 8d2f9de6e8fea9a04b3651c2ada87e26cccc0a31..7cbc34cf35ff69c12260fa0eeb6c2bdda53b3c3d 100644
(file)
--- a/
test/stderr/0361
+++ b/
test/stderr/0361
@@
-12,10
+12,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-63,10
+59,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/0362
b/test/stderr/0362
index b638ecd07272395b6caa0f65d6ae14b01d4d1ccb..b1cfb9a43adf3a3abeb713c54ada2cad5ee18e9c 100644
(file)
--- a/
test/stderr/0362
+++ b/
test/stderr/0362
@@
-5,8
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git
a/test/stderr/0364
b/test/stderr/0364
index 3fd65e473151683de3c07ac5b1bc94a2059e9816..3d11e8a9226879e026a43780e81f1d76c8b06260 100644
(file)
--- a/
test/stderr/0364
+++ b/
test/stderr/0364
@@
-1,11
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing kilos@thishost
--------> r1 router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing kilos@thishost
--------> r1 router <--------
diff --git
a/test/stderr/0374
b/test/stderr/0374
index ea6803720b63a241119a1b12778d7a9cbb150da4..25a12e9f39beef86a4b35553b43ad81ff2f7aa1f 100644
(file)
--- a/
test/stderr/0374
+++ b/
test/stderr/0374
@@
-1,11
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-13,11
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-390,22
+380,12
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: CALLER@myhost.test.ex
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: CALLER@myhost.test.ex
diff --git
a/test/stderr/0375
b/test/stderr/0375
index e0f31435342530502bd4555cb94e97d0d998906f..5bb4081907f0b2206801cbbe9402ea11871089e9 100644
(file)
--- a/
test/stderr/0375
+++ b/
test/stderr/0375
@@
-1,15
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-17,15
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-858,30
+840,12
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: CALLER@myhost.test.ex
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: CALLER@myhost.test.ex
@@
-960,30
+924,12
@@
log writing disabled
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: u1 propagating DSN
-DSN: ut2 propagating DSN
-DSN: ut3 propagating DSN
-DSN: ut4 propagating DSN
-DSN: ut5 propagating DSN
-DSN: ut6 propagating DSN
-DSN: ut7 propagating DSN
-DSN: ut8 propagating DSN
-DSN: real propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: h1@myhost.test.ex
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: h1@myhost.test.ex
diff --git
a/test/stderr/0377
b/test/stderr/0377
index 5ca0ade9d7ec005ebcd28120327b6ad93240c82b..82e492365573dd2ba8621b29fb519aa771108bd9 100644
(file)
--- a/
test/stderr/0377
+++ b/
test/stderr/0377
@@
-1,14
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: defer propagating DSN
-DSN: unseen_aaaa propagating DSN
-DSN: seen_aaaa propagating DSN
-DSN: bbbb propagating DSN
-DSN: bbbb_0 propagating DSN
-DSN: cccc_2nd_time propagating DSN
-DSN: cccc_redirect propagating DSN
-DSN: cccc_accept propagating DSN
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-16,14
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: defer propagating DSN
-DSN: unseen_aaaa propagating DSN
-DSN: seen_aaaa propagating DSN
-DSN: bbbb propagating DSN
-DSN: bbbb_0 propagating DSN
-DSN: cccc_2nd_time propagating DSN
-DSN: cccc_redirect propagating DSN
-DSN: cccc_accept propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-328,14
+312,6
@@
locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: defer propagating DSN
-DSN: unseen_aaaa propagating DSN
-DSN: seen_aaaa propagating DSN
-DSN: bbbb propagating DSN
-DSN: bbbb_0 propagating DSN
-DSN: cccc_2nd_time propagating DSN
-DSN: cccc_redirect propagating DSN
-DSN: cccc_accept propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
@@
-579,14
+555,6
@@
LOG: queue_run MAIN
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: defer propagating DSN
-DSN: unseen_aaaa propagating DSN
-DSN: seen_aaaa propagating DSN
-DSN: bbbb propagating DSN
-DSN: bbbb_0 propagating DSN
-DSN: cccc_2nd_time propagating DSN
-DSN: cccc_redirect propagating DSN
-DSN: cccc_accept propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
diff --git
a/test/stderr/0378
b/test/stderr/0378
index e4823226774c58ee90bd3af76e2f55cd8e4ed891..fad082573cc8186cd9c3538551004e251f6c3f1a 100644
(file)
--- a/
test/stderr/0378
+++ b/
test/stderr/0378
@@
-1,10
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-12,10
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-129,20
+121,12
@@
locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-188,10
+172,6
@@
locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: bounce propagating DSN
-DSN: defer propagating DSN
-DSN: aaaa_2nd_time propagating DSN
-DSN: aaaa propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
diff --git
a/test/stderr/0379
b/test/stderr/0379
index ab435062652a8587d729bb492e9c58a438860e34..f94b23c95bcaeec8896565799f7e5744239c96b9 100644
(file)
--- a/
test/stderr/0379
+++ b/
test/stderr/0379
@@
-1,9
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: defer propagating DSN
-DSN: aaaa_redirect propagating DSN
-DSN: bc propagating DSN
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-11,9
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: defer propagating DSN
-DSN: aaaa_redirect propagating DSN
-DSN: bc propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-142,9
+136,6
@@
locking TESTSUITE/spool/db/retry.lockfile
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: defer propagating DSN
-DSN: aaaa_redirect propagating DSN
-DSN: bc propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
Start queue run: pid=pppp -qf
locking TESTSUITE/spool/db/retry.lockfile
diff --git
a/test/stderr/0380
b/test/stderr/0380
index 5e81f1c67357d8a8fc0bf110efe302bf0ece039c..f483be253b7255dd4d6edb3a82d756b0fa8c9e92 100644
(file)
--- a/
test/stderr/0380
+++ b/
test/stderr/0380
@@
-1,10
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@myhost.test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-12,10
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git
a/test/stderr/0386
b/test/stderr/0386
index c24b8725cd71808da941df8ebc647563bd6bbd59..bec2521e00f4800800b39038c12268699984fa8c 100644
(file)
--- a/
test/stderr/0386
+++ b/
test/stderr/0386
@@
-8,7
+8,6
@@
trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-139,7
+138,6
@@
trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-230,7
+228,6
@@
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@
-414,7
+411,6
@@
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/0388
b/test/stderr/0388
index 96a2efede1132fb562659f25de7742f77fd1f38a..d5e31159a0fb49d8eb4ee9f7a53c8b15ba36f454 100644
(file)
--- a/
test/stderr/0388
+++ b/
test/stderr/0388
@@
-3,8
+3,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
@@
-179,8
+177,6
@@
trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
originator: uid=EXIM_UID gid=EXIM_GID login=EXIMUSER name=
sender address =
set_process_info: pppp accepting a local non-SMTP message from <>
originator: uid=EXIM_UID gid=EXIM_GID login=EXIMUSER name=
sender address =
set_process_info: pppp accepting a local non-SMTP message from <>
@@
-234,8
+230,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaY-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaY-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
diff --git
a/test/stderr/0391
b/test/stderr/0391
index 1878f2f27632fdb2f8197dbd6fcca32ab0aa9a5c..47f5b5609c51c053c654e18c24a5afcab073a5b1 100644
(file)
--- a/
test/stderr/0391
+++ b/
test/stderr/0391
@@
-5,7
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
sender_fullhost = [1.2.3.4]
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
sender_fullhost = [1.2.3.4]
diff --git
a/test/stderr/0398
b/test/stderr/0398
index ff0aa766fab222892ffeaa0bb52ce2a4363eba7b..96cf8999d59e0012570be9a0c2ef552df94067c0 100644
(file)
--- a/
test/stderr/0398
+++ b/
test/stderr/0398
@@
-5,8
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git
a/test/stderr/0399
b/test/stderr/0399
index dcfe3e608139a1fa8dea7e86056b648c90fe3110..3bc5b8d238aa3a1c7cca47dd85151b47d88c4bea 100644
(file)
--- a/
test/stderr/0399
+++ b/
test/stderr/0399
@@
-3,9
+3,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/0402
b/test/stderr/0402
index b5b2ed099bfb1fcadab81c316424d4df1c9dfafc..1eb25f51a2fbceccdbe514a0f14a15a4691901c5 100644
(file)
--- a/
test/stderr/0402
+++ b/
test/stderr/0402
@@
-5,11
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
seeking password data for user "CALLER": using cached result
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
seeking password data for user "CALLER": using cached result
@@
-169,11
+164,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
seeking password data for user "CALLER": using cached result
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
seeking password data for user "CALLER": using cached result
diff --git
a/test/stderr/0403
b/test/stderr/0403
index e27f05a6bbd1f8e5a2b7afd0419399d20fd8b5f8..adb63f156bbfe15bae59e67266c3b626c9f3c187 100644
(file)
--- a/
test/stderr/0403
+++ b/
test/stderr/0403
@@
-5,7
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-54,7
+53,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/0404
b/test/stderr/0404
index 5bdfcb6afbf57b45f3f8c4242da0aff0fe405c23..fe68386fdcaff42e6cee0788759ba050a4b7f418 100644
(file)
--- a/
test/stderr/0404
+++ b/
test/stderr/0404
@@
-7,8
+7,6
@@
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-156,8
+154,6
@@
trusted user
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@
-262,8
+258,6
@@
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-1536,8
+1530,6
@@
trusted user
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/0408
b/test/stderr/0408
index f222df518f74ca67bd7d51532d623f1ceba304d5..fb9df8e3e8c73fa8ce01ee265ad4aedb9691a065 100644
(file)
--- a/
test/stderr/0408
+++ b/
test/stderr/0408
@@
-5,7
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-54,7
+53,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/0414
b/test/stderr/0414
index 6ac19025ad2f6228f93b249d1358014703772484..759e0f3bf681071dd8d8dee4e77919f91de7073a 100644
(file)
--- a/
test/stderr/0414
+++ b/
test/stderr/0414
@@
-3,9
+3,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git
a/test/stderr/0419
b/test/stderr/0419
index 3b5c51a17dcb4d90924a8e22d367206304587093..8aba8f1e48ba6695f219da3c17c98efeb55fe316 100644
(file)
--- a/
test/stderr/0419
+++ b/
test/stderr/0419
@@
-5,7
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: dnslookup propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
diff --git
a/test/stderr/0426
b/test/stderr/0426
index 52914f0a575aadc20c2c031e869968927e5604d3..cbcf7687f683f18980db5e56eda104b2c1c17d98 100644
(file)
--- a/
test/stderr/0426
+++ b/
test/stderr/0426
@@
-1,8
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
LOG: MAIN
<= CALLER@test.ex U=CALLER P=local S=sss
created log directory TESTSUITE/spool/log
@@
-10,8
+8,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-57,16
+53,12
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git
a/test/stderr/0432
b/test/stderr/0432
index ade8e0015d83b4d399da47e16f7f675a491e2aaf..f74df091c0adc5853b56de17585935ccdcaccc7b 100644
(file)
--- a/
test/stderr/0432
+++ b/
test/stderr/0432
@@
-30,7
+30,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
sender_fullhost = [1.2.3.4]
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
sender_fullhost = [1.2.3.4]
@@
-140,7
+139,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
sender_fullhost = [1.2.3.4]
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
sender_fullhost = [1.2.3.4]
diff --git
a/test/stderr/0463
b/test/stderr/0463
index c8c956ddea6f84cf931404aee68903e78587a4d7..28e9d39517b0ad2006bb9813a80fd82798435386 100644
(file)
--- a/
test/stderr/0463
+++ b/
test/stderr/0463
@@
-3,7
+3,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: all propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/0464
b/test/stderr/0464
index b4c6636911fb7d5d3885e441c0a63b7dcbd62622..49315076cc67150ef80325450a1be8139981890b 100644
(file)
--- a/
test/stderr/0464
+++ b/
test/stderr/0464
@@
-5,8
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex>
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.ex>
diff --git
a/test/stderr/0469
b/test/stderr/0469
index ef16753d1457bf3eb57ee098f78d4e8122496261..24bee06d0820197560efa8be374b90e1f8a6a986 100644
(file)
--- a/
test/stderr/0469
+++ b/
test/stderr/0469
@@
-3,7
+3,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/0479
b/test/stderr/0479
index da8a56aad95eeb1271e5aa0ae25aa68d876627b2..070ed9074f24ce1a8ead668a907c6503ba910313 100644
(file)
--- a/
test/stderr/0479
+++ b/
test/stderr/0479
@@
-5,7
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@the.local.host.name
sender_fullhost = [1.2.3.4]
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@the.local.host.name
sender_fullhost = [1.2.3.4]
diff --git
a/test/stderr/0483
b/test/stderr/0483
index a6e836e34c831c743a238e8629733f442478e8ac..b6b284e64879c84e141818cc331348268c5f0385 100644
(file)
--- a/
test/stderr/0483
+++ b/
test/stderr/0483
@@
-1,7
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
LOG: smtp_connection MAIN
SMTP connection from CALLER
LOG: MAIN
LOG: smtp_connection MAIN
SMTP connection from CALLER
LOG: MAIN
diff --git
a/test/stderr/0487
b/test/stderr/0487
index 1dd562218f55c1c10924ed97ba4eba1d31f23bb9..88ebfd66c025834464b56c68f646c409493c6165 100644
(file)
--- a/
test/stderr/0487
+++ b/
test/stderr/0487
@@
-8,7
+8,6
@@
trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-83,7
+82,6
@@
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/0499
b/test/stderr/0499
index ba278cdac20bfef8cc5194e830d14016274f0963..62b5a8afb261c8242b13246ff205f6f3e8cb4f06 100644
(file)
--- a/
test/stderr/0499
+++ b/
test/stderr/0499
@@
-3,7
+3,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@myhost.test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/0543
b/test/stderr/0543
index b886b8464d9d4632c6695ca69d5eaffe4f6a2816..df359d6a1380e7f4ddb6b462e9e011f4d84d1d88 100644
(file)
--- a/
test/stderr/0543
+++ b/
test/stderr/0543
@@
-1,7
+1,6
@@
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: smarthost propagating DSN
LOG: queue_run MAIN
Start queue run: pid=pppp
locking TESTSUITE/spool/db/retry.lockfile
LOG: queue_run MAIN
Start queue run: pid=pppp
locking TESTSUITE/spool/db/retry.lockfile
diff --git
a/test/stderr/0545
b/test/stderr/0545
index 99cf67821d287bc588084bc0a482bfb2cc8bc008..b28f671ea56e7052e2c62a3fccff9767c5aaaa90 100644
(file)
--- a/
test/stderr/0545
+++ b/
test/stderr/0545
@@
-3,7
+3,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: dns propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@the.local.host.name
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@the.local.host.name
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@
-73,7
+72,6
@@
changed uid/gid: forcing real = effective
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
uid=uuuu gid=CALLER_GID pid=pppp
configuration file is TESTSUITE/test-config
admin user
-DSN: dns propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@the.local.host.name
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@the.local.host.name
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/0563
b/test/stderr/0563
index 21e7a13e5f9841766edff3cba0f5eb2feeb5ba74..2354943f8685be2e9d5c53929619f8ef4c0c8ab2 100644
(file)
--- a/
test/stderr/0563
+++ b/
test/stderr/0563
@@
-5,8
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: router1 propagating DSN
-DSN: router2 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_GECOS
sender address = CALLER@testexim.test.ex
Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_GECOS
sender address = CALLER@testexim.test.ex
Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
diff --git
a/test/stderr/2201
b/test/stderr/2201
index 037d80d282117a2b6f5833db7bc65cd5a794b540..01283d60f11909f60d0521fc06610a9222ec444c 100644
(file)
--- a/
test/stderr/2201
+++ b/
test/stderr/2201
@@
-6,9
+6,6
@@
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git
a/test/stderr/2600
b/test/stderr/2600
index cdb2409b86d599be8eeac93d16d5dccd17754bb1..5976263c14fd8242dbbf65a5fa50ead6110befc8 100644
(file)
--- a/
test/stderr/2600
+++ b/
test/stderr/2600
@@
-111,7
+111,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-207,7
+206,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-293,7
+291,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-342,7
+339,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/3210
b/test/stderr/3210
index b80a287385cbc20c98c925ef521704aa335fc6c8..76677d7a08a39d48b1f8d061fa6756e90b26ddb0 100644
(file)
--- a/
test/stderr/3210
+++ b/
test/stderr/3210
@@
-5,7
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
sender address = CALLER@test.ex
Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
diff --git
a/test/stderr/3400
b/test/stderr/3400
index aca7f5f6876c501e89898d717c96b119c9cc0a8b..a57621a058d1ab0a8d9a99fade1d6325c5ffb152 100644
(file)
--- a/
test/stderr/3400
+++ b/
test/stderr/3400
@@
-398,8
+398,6
@@
trusted user
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: fail_remote_domains propagating DSN
-DSN: localuser propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
diff --git
a/test/stderr/5004
b/test/stderr/5004
index 5d1d0d31cb7debb6dcbe02846bfc67a03a36e7e0..1f00fd6f9c3ad9e84f618fc6b2617a5a747af89d 100644
(file)
--- a/
test/stderr/5004
+++ b/
test/stderr/5004
@@
-7,7
+7,6
@@
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
uid=EXIM_UID gid=EXIM_GID pid=pppp
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-58,7
+57,6
@@
trusted user
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
admin user
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": using cached result
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/5005
b/test/stderr/5005
index 36d82919294852dd105b14107622355204703ea5..0b804ae95decd28821c0d7c2c6b870bfd62635d4 100644
(file)
--- a/
test/stderr/5005
+++ b/
test/stderr/5005
@@
-5,7
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-54,7
+53,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@
-197,7
+195,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-245,7
+242,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@
-389,7
+385,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-437,7
+432,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
@@
-590,7
+584,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-638,7
+631,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/5006
b/test/stderr/5006
index 2b2b3776135336569c64b944071f9924f5edf0e7..b78067eb218ee69ddbec53ce834bb366cb9ae972 100644
(file)
--- a/
test/stderr/5006
+++ b/
test/stderr/5006
@@
-5,7
+5,6
@@
configuration file is TESTSUITE/test-config
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
admin user
changed uid/gid: privilege not needed
uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
@@
-54,7
+53,6
@@
changed uid/gid: forcing real = effective
configuration file is TESTSUITE/test-config
trusted user
admin user
configuration file is TESTSUITE/test-config
trusted user
admin user
-DSN: r1 propagating DSN
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
seeking password data for user "CALLER": cache not available
getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
set_process_info: pppp delivering specified messages
diff --git
a/test/stderr/5204
b/test/stderr/5204
index 4d169591ff408f2f725c72d0c4e060abe84fdd24..38f568d23fb7a014e60eeeb82575b58c7f3629a2 100644
(file)
--- a/
test/stderr/5204
+++ b/
test/stderr/5204
@@
-3,10
+3,6
@@
LOG: MAIN
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "DECLINE cannot route this one (DECLINE)"@some.host
--------> b router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "DECLINE cannot route this one (DECLINE)"@some.host
--------> b router <--------
@@
-27,10
+23,6
@@
no more routers
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "FAIL cannot route this one (FAIL)"@some.host
--------> b router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "FAIL cannot route this one (FAIL)"@some.host
--------> b router <--------
@@
-49,10
+41,6
@@
q router forced address failure
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "ERROR cannot route this one (ERROR)"@some.host
--------> b router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "ERROR cannot route this one (ERROR)"@some.host
--------> b router <--------
@@
-74,10
+62,6
@@
q router: defer for "ERROR cannot route this one (ERROR)"@some.host
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "DEFER cannot route this one (DEFER)"@some.host
--------> b router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "DEFER cannot route this one (DEFER)"@some.host
--------> b router <--------
@@
-97,10
+81,6
@@
q router: defer for "DEFER cannot route this one (DEFER)"@some.host
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
--------> b router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
--------> b router <--------
@@
-128,10
+108,6
@@
routed by q router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing PASS@some.host
--------> b router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing PASS@some.host
--------> b router <--------
@@
-171,10
+147,6
@@
routed by s router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "FREEZE cannot route this one (FREEZE)"@some.host
--------> b router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "FREEZE cannot route this one (FREEZE)"@some.host
--------> b router <--------
@@
-194,10
+166,6
@@
q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "REDIRECT postmaster@test.ex"@some.host
--------> b router <--------
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing "REDIRECT postmaster@test.ex"@some.host
--------> b router <--------
@@
-252,10
+220,6
@@
routed by pm router
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
Exim version x.yz ....
configuration file is TESTSUITE/test-config
admin user
-DSN: b propagating DSN
-DSN: q propagating DSN
-DSN: s propagating DSN
-DSN: pm propagating DSN
host in hosts_connection_nolog? no (option unset)
LOG: smtp_connection MAIN
SMTP connection from [V4NET.2.3.4]
host in hosts_connection_nolog? no (option unset)
LOG: smtp_connection MAIN
SMTP connection from [V4NET.2.3.4]