Gitweb:
http://git.exim.org/exim.git/commitdiff/cfbd9ca07439b02ae227012ad2b9f13a8997d39e
Commit: cfbd9ca07439b02ae227012ad2b9f13a8997d39e
Parent: efdec7f5befe7f67e3e7f9f93b180a0a5bb8ac02
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Apr 18 21:21:28 2012 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Wed Apr 18 21:21:28 2012 +0100
Fix bug 1229.
Update testcase output with now-expected info.
---
test/stderr/3400 | 6 +++---
test/stderr/3408 | 2 +-
test/stderr/3410 | 6 +++---
test/stderr/3500 | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test/stderr/3400 b/test/stderr/3400
index 598fe2f..80b80f0 100644
--- 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@???> rejected RCPT <userx@???>: authentication required
->>> mylogin authenticator:
+>>> mylogin authenticator server_condition:
>>> $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@???> rejected RCPT <userx@???>: authentication required
->>> mylogin authenticator:
+>>> mylogin authenticator server_condition:
>>> $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
-mylogin authenticator:
+mylogin authenticator server_condition:
$auth1 = userx secret
$1 = userx secret
+++MYLOGIN $1="userx secret" $2="" $3=""
diff --git a/test/stderr/3408 b/test/stderr/3408
index a5e576f..52ffc7a 100644
--- a/test/stderr/3408
+++ b/test/stderr/3408
@@ -50,7 +50,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@??? 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 "*")
->>> plain authenticator:
+>>> plain authenticator server_condition:
>>> $auth1 =
>>> $auth2 = userx
>>> $auth3 = secret
diff --git a/test/stderr/3410 b/test/stderr/3410
index 43f5316..d09d222 100644
--- 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 "*")
->>> auth1 authenticator:
+>>> auth1 authenticator server_condition:
>>> $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 "*")
->>> auth1 authenticator:
+>>> auth1 authenticator server_condition:
>>> $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 "*")
->>> auth2 authenticator:
+>>> auth2 authenticator server_condition:
>>> $auth1 = userx
>>> $auth2 = secret
>>> $1 = userx
diff --git a/test/stderr/3500 b/test/stderr/3500
index 8717979..3d47041 100644
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -28,7 +28,7 @@
>>> challenge = <1896.697170952@???>
>>> received = b913a602c7eda7a495b4e6e7334d3890
>>> digest = b913a602c7eda7a495b4e6e7334d3890
->>> cram_md5 authenticator:
+>>> cram_md5 authenticator server_condition:
>>> $auth1 = tim
>>> $1 = tim
>>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
@@ -76,7 +76,7 @@ LOG: 10HmaY-0005vi-00 <= userx@??? H=(test.host) [10.0.0.1] P=esmtpa A=c
>>> challenge = <1896.697170952@???>
>>> received = b913a602c7eda7a495b4e6e7334d3890
>>> digest = b913a602c7eda7a495b4e6e7334d3890
->>> cram_md5 authenticator:
+>>> cram_md5 authenticator server_condition:
>>> $auth1 = tim
>>> $1 = tim
>>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
