summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-11-21 00:50:38 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2018-11-21 00:50:38 +0000
commitc0fb53b74e07fd17247960c998ffcb1f3c9f931f (patch)
treee257b1f3ebc8df4ff1dec8efd7b06ce8dc3affe7 /test
parentbe2b133acc9607bad24c7fe5a6cd06624701281a (diff)
Fix cyrus-sasl authenticator for $authenticated_fail_id. Bug 2238
Diffstat (limited to 'test')
-rw-r--r--test/confs/3800 (renamed from test/confs/9300)0
-rw-r--r--test/log/3800 (renamed from test/log/9300)4
-rw-r--r--test/rejectlog/3800 (renamed from test/rejectlog/9300)4
-rw-r--r--test/scripts/3800-Cyrus-SASL/3800 (renamed from test/scripts/9300-Cyrus-SASL/9300)1
-rw-r--r--test/scripts/3800-Cyrus-SASL/REQUIRES (renamed from test/scripts/9300-Cyrus-SASL/REQUIRES)0
-rw-r--r--test/stdout/3800 (renamed from test/stdout/9300)4
6 files changed, 10 insertions, 3 deletions
diff --git a/test/confs/9300 b/test/confs/3800
index 086b506c6..086b506c6 100644
--- a/test/confs/9300
+++ b/test/confs/3800
diff --git a/test/log/9300 b/test/log/3800
index eb08483b8..b62ed3986 100644
--- a/test/log/9300
+++ b/test/log/3800
@@ -1,2 +1,4 @@
+
+******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 sasl2 authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data
+1999-03-02 09:44:33 sasl2 authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data (set_id=ph10)
diff --git a/test/rejectlog/9300 b/test/rejectlog/3800
index c802a9484..47511b748 100644
--- a/test/rejectlog/9300
+++ b/test/rejectlog/3800
@@ -1,3 +1,5 @@
+
+******** SERVER ********
1999-03-02 09:44:33 sasl2 authenticator (PLAIN):
Cyrus SASL permanent failure: user not found
-1999-03-02 09:44:33 sasl2 authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data
+1999-03-02 09:44:33 sasl2 authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data (set_id=ph10)
diff --git a/test/scripts/9300-Cyrus-SASL/9300 b/test/scripts/3800-Cyrus-SASL/3800
index 4be6c17c0..a033ea0c6 100644
--- a/test/scripts/9300-Cyrus-SASL/9300
+++ b/test/scripts/3800-Cyrus-SASL/3800
@@ -8,6 +8,7 @@ EHLO xxxx
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
AUTH PLAIN AHBoMTAAc2VjcmV0
??? 535
diff --git a/test/scripts/9300-Cyrus-SASL/REQUIRES b/test/scripts/3800-Cyrus-SASL/REQUIRES
index f6c49fc42..f6c49fc42 100644
--- a/test/scripts/9300-Cyrus-SASL/REQUIRES
+++ b/test/scripts/3800-Cyrus-SASL/REQUIRES
diff --git a/test/stdout/9300 b/test/stdout/3800
index b9e6b6d54..998df3a19 100644
--- a/test/stdout/9300
+++ b/test/stdout/3800
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-8BITMIME
+??? 250-
<<< 250-PIPELINING
??? 250-
<<< 250-AUTH ANONYMOUS PLAIN
@@ -18,7 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
>>> AUTH ANONYMOUS
??? 334
<<< 334
->>> CALLER
+>>> ph10
??? 235
<<< 235 Authentication succeeded
>>> quit