s4/auth/simple_bind: correctly report TLS state

It went wrong in 366f8cf0903e3583fda42696df62a5337f22131f

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Wed Jan 26 12:39:52 UTC 2022 on sn-devel-184

(cherry picked from commit 309f1982263677045d407463eb19a2444c165a63)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14996

diff --git a/selftest/knownfail.d/authlog b/selftest/knownfail.d/authlog
deleted file mode 100644 (file)
index acef117..0000000
--- a/selftest/knownfail.d/authlog
+++ /dev/null
@@ -1,4 +0,0 @@
-samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_ldap_simple_bind
-samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_ldap_simple_bind_bad_password
-samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_ldap_simple_bind_bad_user
-samba.tests.auth_log.samba.tests.auth_log.AuthLogTests.test_ldap_simple_bind_unparseable_user

diff --git a/source4/auth/ntlm/auth_simple.c b/source4/auth/ntlm/auth_simple.c
index 8301aec519ca94440a789fe7536aa6b28d8e8de0..b2e76381395393aa12b8192ec20ea967532f3081 100644 (file)
--- a/source4/auth/ntlm/auth_simple.c
+++ b/source4/auth/ntlm/auth_simple.c
@@ -88,9 +88,9 @@ _PUBLIC_ struct tevent_req *authenticate_ldap_simple_bind_send(TALLOC_CTX *mem_c
        user_info->service_description = "LDAP";
 
        if (using_tls) {
-               user_info->auth_description = "simple bind";
-       } else {
                user_info->auth_description = "simple bind/TLS";
+       } else {
+               user_info->auth_description = "simple bind";
        }
 
        user_info->password_state = AUTH_PASSWORD_PLAIN;