Consistent logging, always use DKIM instead of mixed DKIM/PDKIM

[exim.git] / test / stderr / 0078

diff --git a/test/stderr/0078 b/test/stderr/0078
index 3ab49c8202b338e6384e048e5d162ce7cb0f70e1..fc573ce9b701e72fe037e8a3cc43f8c4ea9d0c7f 100644 (file)
--- a/test/stderr/0078
+++ b/test/stderr/0078
@@ -1,9 +1,7 @@
 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
+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt6.test.ex
 --------> lookuphost router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt6.test.ex
 --------> lookuphost router <--------


@@ -25,9 +23,7 @@ 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
+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing myhost.test.ex@mxt1.test.ex
 --------> lookuphost router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing myhost.test.ex@mxt1.test.ex
 --------> lookuphost router <--------


@@ -46,8 +42,8 @@ calling self router
 self router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
 self router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname

-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "myhost.test.ex" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'myhost.test.ex' options = 'byname'

 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname
 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname


@@ -63,9 +59,7 @@ 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
+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt1.test.ex
 --------> lookuphost router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@mxt1.test.ex
 --------> lookuphost router <--------


@@ -84,8 +78,8 @@ calling self router
 self router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname
 self router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * $local_part byname

-original list of hosts = "$local_part" options = byname
-expanded list of hosts = "xx" options = byname
+original list of hosts = '$local_part' options = 'byname'
+expanded list of hosts = 'xx' options = 'byname'

 set transport remote_smtp
 finding IP address for xx
 calling host_find_byname
 set transport remote_smtp
 finding IP address for xx
 calling host_find_byname


@@ -98,8 +92,8 @@ calling self2 router
 self2 router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * myhost.test.ex byname
 self2 router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
 route_item = * myhost.test.ex byname

-original list of hosts = "myhost.test.ex" options = byname
-expanded list of hosts = "myhost.test.ex" options = byname
+original list of hosts = 'myhost.test.ex' options = 'byname'
+expanded list of hosts = 'myhost.test.ex' options = 'byname'

 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname
 set transport remote_smtp
 finding IP address for myhost.test.ex
 calling host_find_byname


@@ -115,9 +109,7 @@ 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
+dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@not.exist
 --------> lookuphost router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing xx@not.exist
 --------> lookuphost router <--------