summaryrefslogtreecommitdiff
path: root/test/log/3600
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2012-11-07 01:53:37 -0500
committerPhil Pennock <pdp@exim.org>2012-11-07 02:05:20 -0500
commitf68fe5f62128effcce35efca90d74bc6df066765 (patch)
treefcde139aaa03b7d77636a6016217ed528e0b59f8 /test/log/3600
parentc8e2fc1e846d1c9bee207d162182fb770b9ae1bd (diff)
Fix server_set_id for SPA/NTLM auth.
Broken in 4.80 release, commit 08488c86. We need to leave $auth1 available after the authenticator returns, so that server_set_id can be evaluated by the caller. We need to do this whether we succeed or fail, because server_set_id only makes it into $authenticated_id if we return OK, but is logged regardless. Updated test config to set server_set_id; updated logs.
Diffstat (limited to 'test/log/3600')
-rw-r--r--test/log/36004
1 files changed, 2 insertions, 2 deletions
diff --git a/test/log/3600 b/test/log/3600
index 43549c63a..16c59f368 100644
--- a/test/log/3600
+++ b/test/log/3600
@@ -11,7 +11,7 @@
******** 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 10HmaY-0005vi-00 <= ok@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=spa S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 spa authenticator failed for localhost (myhost.test.ex) [127.0.0.1]: 535 Incorrect authentication data
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=spa:username S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 spa authenticator failed for localhost (myhost.test.ex) [127.0.0.1]: 535 Incorrect authentication data (set_id=username)
1999-03-02 09:44:33 spa authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data
1999-03-02 09:44:33 spa authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data