git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lookups: fix $local_part_data for a match on a filename list element. Bug 2691
[users/heiko/exim.git]
/
test
/
stderr
/
0375
diff --git
a/test/stderr/0375
b/test/stderr/0375
index 8b59febdc07682b9b9346bb9f9d53ced31b60953..6c8f00010bdbceccc33252e973308cf6f474c5f3 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,7
@@
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
+dropping to exim gid; retaining priv uid
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@
-138,7
+121,7
@@
set transport ut6
queued for ut6 transport: local_part = f3
domain = myhost.test.ex
errors_to=
queued for ut6 transport: local_part = f3
domain = myhost.test.ex
errors_to=
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^f\d
routed by ut6 router (unseen)
envelope to: f3@myhost.test.ex
transport: ut6
routed by ut6 router (unseen)
envelope to: f3@myhost.test.ex
transport: ut6
@@
-176,7
+159,7
@@
ut6 router called for f2@myhost.test.ex
queued for ut6 transport: local_part = f2
domain = myhost.test.ex
errors_to=
queued for ut6 transport: local_part = f2
domain = myhost.test.ex
errors_to=
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^f\d
routed by ut6 router (unseen)
envelope to: f2@myhost.test.ex
transport: ut6
routed by ut6 router (unseen)
envelope to: f2@myhost.test.ex
transport: ut6
@@
-214,7
+197,7
@@
ut6 router called for f1@myhost.test.ex
queued for ut6 transport: local_part = f1
domain = myhost.test.ex
errors_to=
queued for ut6 transport: local_part = f1
domain = myhost.test.ex
errors_to=
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^f\d
routed by ut6 router (unseen)
envelope to: f1@myhost.test.ex
transport: ut6
routed by ut6 router (unseen)
envelope to: f1@myhost.test.ex
transport: ut6
@@
-248,7
+231,7
@@
set transport ut5
queued for ut5 transport: local_part = e1
domain = myhost.test.ex
errors_to=NULL
queued for ut5 transport: local_part = e1
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^e\d
routed by ut5 router (unseen)
envelope to: e1@myhost.test.ex
transport: ut5
routed by ut5 router (unseen)
envelope to: e1@myhost.test.ex
transport: ut5
@@
-277,7
+260,7
@@
set transport ut4
queued for ut4 transport: local_part = d3
domain = myhost.test.ex
errors_to=
queued for ut4 transport: local_part = d3
domain = myhost.test.ex
errors_to=
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^d\d
routed by ut4 router (unseen)
envelope to: d3@myhost.test.ex
transport: ut4
routed by ut4 router (unseen)
envelope to: d3@myhost.test.ex
transport: ut4
@@
-306,7
+289,7
@@
ut4 router called for d2@myhost.test.ex
queued for ut4 transport: local_part = d2
domain = myhost.test.ex
errors_to=
queued for ut4 transport: local_part = d2
domain = myhost.test.ex
errors_to=
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^d\d
routed by ut4 router (unseen)
envelope to: d2@myhost.test.ex
transport: ut4
routed by ut4 router (unseen)
envelope to: d2@myhost.test.ex
transport: ut4
@@
-335,7
+318,7
@@
ut4 router called for d1@myhost.test.ex
queued for ut4 transport: local_part = d1
domain = myhost.test.ex
errors_to=
queued for ut4 transport: local_part = d1
domain = myhost.test.ex
errors_to=
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^d\d
routed by ut4 router (unseen)
envelope to: d1@myhost.test.ex
transport: ut4
routed by ut4 router (unseen)
envelope to: d1@myhost.test.ex
transport: ut4
@@
-361,7
+344,7
@@
set transport ut3
queued for ut3 transport: local_part = c1
domain = myhost.test.ex
errors_to=
queued for ut3 transport: local_part = c1
domain = myhost.test.ex
errors_to=
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^c\d
routed by ut3 router (unseen)
envelope to: c1@myhost.test.ex
transport: ut3
routed by ut3 router (unseen)
envelope to: c1@myhost.test.ex
transport: ut3
@@
-383,7
+366,7
@@
set transport ut2
queued for ut2 transport: local_part = b1
domain = myhost.test.ex
errors_to=
queued for ut2 transport: local_part = b1
domain = myhost.test.ex
errors_to=
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^b\d
routed by ut2 router (unseen)
envelope to: b1@myhost.test.ex
transport: ut2
routed by ut2 router (unseen)
envelope to: b1@myhost.test.ex
transport: ut2
@@
-401,7
+384,7
@@
set transport ut1
queued for ut1 transport: local_part = a1
domain = myhost.test.ex
errors_to=
queued for ut1 transport: local_part = a1
domain = myhost.test.ex
errors_to=
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^a\d
routed by u1 router (unseen)
envelope to: a1@myhost.test.ex
transport: ut1
routed by u1 router (unseen)
envelope to: a1@myhost.test.ex
transport: ut1
@@
-468,7
+451,7
@@
set transport real
queued for real transport: local_part = f3
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = f3
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: f3@myhost.test.ex
transport: real
routed by real router
envelope to: f3@myhost.test.ex
transport: real
@@
-490,7
+473,7
@@
real router called for f2@myhost.test.ex
queued for real transport: local_part = f2
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = f2
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: f2@myhost.test.ex
transport: real
routed by real router
envelope to: f2@myhost.test.ex
transport: real
@@
-512,7
+495,7
@@
real router called for f1@myhost.test.ex
queued for real transport: local_part = f1
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = f1
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: f1@myhost.test.ex
transport: real
routed by real router
envelope to: f1@myhost.test.ex
transport: real
@@
-538,7
+521,7
@@
real router called for e1@myhost.test.ex
queued for real transport: local_part = e1
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = e1
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: e1@myhost.test.ex
transport: real
routed by real router
envelope to: e1@myhost.test.ex
transport: real
@@
-568,7
+551,7
@@
real router called for d3@myhost.test.ex
queued for real transport: local_part = d3
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = d3
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: d3@myhost.test.ex
transport: real
routed by real router
envelope to: d3@myhost.test.ex
transport: real
@@
-598,7
+581,7
@@
real router called for d2@myhost.test.ex
queued for real transport: local_part = d2
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = d2
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: d2@myhost.test.ex
transport: real
routed by real router
envelope to: d2@myhost.test.ex
transport: real
@@
-628,7
+611,7
@@
real router called for d1@myhost.test.ex
queued for real transport: local_part = d1
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = d1
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: d1@myhost.test.ex
transport: real
routed by real router
envelope to: d1@myhost.test.ex
transport: real
@@
-662,7
+645,7
@@
real router called for c1@myhost.test.ex
queued for real transport: local_part = c1
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = c1
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: c1@myhost.test.ex
transport: real
routed by real router
envelope to: c1@myhost.test.ex
transport: real
@@
-700,7
+683,7
@@
real router called for b1@myhost.test.ex
queued for real transport: local_part = b1
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = b1
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: b1@myhost.test.ex
transport: real
routed by real router
envelope to: b1@myhost.test.ex
transport: real
@@
-742,7
+725,7
@@
real router called for a1@myhost.test.ex
queued for real transport: local_part = a1
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = a1
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: a1@myhost.test.ex
transport: real
routed by real router
envelope to: a1@myhost.test.ex
transport: real
@@
-858,30
+841,13
@@
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
+dropping to exim gid; retaining priv uid
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: CALLER@myhost.test.ex
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: CALLER@myhost.test.ex
@@
-930,7
+896,7
@@
set transport real
queued for real transport: local_part = CALLER
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = CALLER
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: CALLER@myhost.test.ex
transport: real
routed by real router
envelope to: CALLER@myhost.test.ex
transport: real
@@
-944,46
+910,28
@@
After routing:
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
=> CALLER <CALLER@myhost.test.ex> P=<> R=real T=real
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
=> CALLER <CALLER@myhost.test.ex> P=<> R=real T=real
-locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
Completed
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(local-accept-delivery)
terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(bounce-message)
terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: MAIN
d3@myhost.test.ex <d3@myhost.test.ex>: error ignored
log writing disabled
LOG: MAIN
b1@myhost.test.ex <b1@myhost.test.ex>: error ignored
log writing disabled
LOG: MAIN
d3@myhost.test.ex <d3@myhost.test.ex>: error ignored
log writing disabled
LOG: MAIN
b1@myhost.test.ex <b1@myhost.test.ex>: error ignored
log writing disabled
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(local-accept-delivery)
terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(fresh-exec)
terminating with rc=0 >>>>>>>>>>>>>>>>
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
+dropping to exim gid; retaining priv uid
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: h1@myhost.test.ex
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: h1@myhost.test.ex
@@
-1030,7
+978,7
@@
set transport ut1
queued for ut1 transport: local_part = h1
domain = myhost.test.ex
errors_to=NULL
queued for ut1 transport: local_part = h1
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL local
part_data=NULL
+ domain_data=NULL local
_part_data=^h\d
routed by ut8 router (unseen)
envelope to: h1@myhost.test.ex
transport: ut1
routed by ut8 router (unseen)
envelope to: h1@myhost.test.ex
transport: ut1
@@
-1051,7
+999,7
@@
set transport real
queued for real transport: local_part = h1
domain = myhost.test.ex
errors_to=NULL
queued for real transport: local_part = h1
domain = myhost.test.ex
errors_to=NULL
- domain_data=NULL localpart_data=NULL
+ domain_data=NULL local
_
part_data=NULL
routed by real router
envelope to: h1@myhost.test.ex
transport: real
routed by real router
envelope to: h1@myhost.test.ex
transport: real
@@
-1070,8
+1018,7
@@
locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
=> h1 <h1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=ut8 T=ut1
log writing disabled
LOG: MAIN
=> h1 <h1@myhost.test.ex> P=<CALLER@myhost.test.ex> R=ut8 T=ut1
log writing disabled
-locking TESTSUITE/spool/db/retry.lockfile
LOG: MAIN
Completed
LOG: MAIN
Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(local-accept-delivery)
terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp
(fresh-exec)
terminating with rc=0 >>>>>>>>>>>>>>>>