Fix bug 1229.

Update testcase output with now-expected info.

diff --git a/test/stderr/3400 b/test/stderr/3400
index 598fe2f1ac10fc711242b3a1fa53fa601ae7aeae..80b80f05e49b13ae38ae3aa5c2d30d593e15ce08 100644 (file)
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -122,7 +122,7 @@ LOG: H=(test.host) [10.0.0.1] rejected ETRN abcd: authentication required
 >>> check !authenticated = *
 >>> deny: condition test succeeded
 LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@test.ex>: authentication required
 >>> check !authenticated = *
 >>> deny: condition test succeeded
 LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@test.ex>: authentication required

->>> mylogin authenticator:
+>>> mylogin authenticator server_condition:

 >>>   $auth1 = userx secret
 >>>   $1 = userx secret
 >>> +++MYLOGIN $1="userx secret" $2="" $3=""
 >>>   $auth1 = userx secret
 >>>   $1 = userx secret
 >>> +++MYLOGIN $1="userx secret" $2="" $3=""


@@ -294,7 +294,7 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd
 >>> accept: condition test failed
 >>> accept: endpass encountered - denying access
 LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cus.cam.ac.uk>: authentication required
 >>> accept: condition test failed
 >>> accept: endpass encountered - denying access
 LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cus.cam.ac.uk>: authentication required

->>> mylogin authenticator:
+>>> mylogin authenticator server_condition:

 >>>   $auth1 = userx secret
 >>>   $1 = userx secret
 >>> +++MYLOGIN $1="userx secret" $2="" $3=""
 >>>   $auth1 = userx secret
 >>>   $1 = userx secret
 >>> +++MYLOGIN $1="userx secret" $2="" $3=""


@@ -407,7 +407,7 @@ SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
 250 HELP
 SMTP<< auth mylogin dXNlcnggc2VjcmV0
 250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
 250 HELP
 SMTP<< auth mylogin dXNlcnggc2VjcmV0

-mylogin authenticator:
+mylogin authenticator server_condition:

   $auth1 = userx secret
   $1 = userx secret
 +++MYLOGIN $1="userx secret" $2="" $3=""
   $auth1 = userx secret
   $1 = userx secret
 +++MYLOGIN $1="userx secret" $2="" $3=""

diff --git a/test/stderr/3408 b/test/stderr/3408
index a5e576f43293f960c1800e5c6bfee990cb11f4ea..52ffc7ad3979e1037dee796b1b2bc3118cb85c30 100644 (file)
--- a/test/stderr/3408
+++ b/test/stderr/3408
@@ -50,7 +50,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

->>> plain authenticator:
+>>> plain authenticator server_condition:

 >>>   $auth1 = 
 >>>   $auth2 = userx
 >>>   $auth3 = secret
 >>>   $auth1 = 
 >>>   $auth2 = userx
 >>>   $auth3 = secret

diff --git a/test/stderr/3410 b/test/stderr/3410
index 43f5316681a9e87193654a3808d9f631348de80b..d09d2225610da49e556284917291fe05a10807a5 100644 (file)
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -15,7 +15,7 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

->>> auth1 authenticator:
+>>> auth1 authenticator server_condition:

 >>>   $auth1 = 
 >>>   $auth2 = userx
 >>>   $auth3 = secret
 >>>   $auth1 = 
 >>>   $auth2 = userx
 >>>   $auth3 = secret


@@ -45,7 +45,7 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

->>> auth1 authenticator:
+>>> auth1 authenticator server_condition:

 >>>   $auth1 = 
 >>>   $auth2 = userx
 >>>   $auth3 = secret
 >>>   $auth1 = 
 >>>   $auth2 = userx
 >>>   $auth3 = secret


@@ -69,7 +69,7 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

->>> auth2 authenticator:
+>>> auth2 authenticator server_condition:

 >>>   $auth1 = userx
 >>>   $auth2 = secret
 >>>   $1 = userx
 >>>   $auth1 = userx
 >>>   $auth2 = secret
 >>>   $1 = userx

diff --git a/test/stderr/3500 b/test/stderr/3500
index 87179790de0466df40cd158eec2719baccf81e2e..3d470414d9ddb555b8bed21e7f5c42681fc985cc 100644 (file)
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -28,7 +28,7 @@
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>>           received  = b913a602c7eda7a495b4e6e7334d3890
 >>>           digest    = b913a602c7eda7a495b4e6e7334d3890
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>>           received  = b913a602c7eda7a495b4e6e7334d3890
 >>>           digest    = b913a602c7eda7a495b4e6e7334d3890

->>> cram_md5 authenticator:
+>>> cram_md5 authenticator server_condition:

 >>>   $auth1 = tim
 >>>   $1 = tim
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>>   $auth1 = tim
 >>>   $1 = tim
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""


@@ -76,7 +76,7 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>>           received  = b913a602c7eda7a495b4e6e7334d3890
 >>>           digest    = b913a602c7eda7a495b4e6e7334d3890
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>>           received  = b913a602c7eda7a495b4e6e7334d3890
 >>>           digest    = b913a602c7eda7a495b4e6e7334d3890

->>> cram_md5 authenticator:
+>>> cram_md5 authenticator server_condition:

 >>>   $auth1 = tim
 >>>   $1 = tim
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>>   $auth1 = tim
 >>>   $1 = tim
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""