[SCM] Samba Shared Repository - branch v4-15-test updated

[Jule Anger]

The branch, v4-15-test has been updated
       via  078088833a4 s4/auth/simple_bind: correctly report TLS state
       via  8fbb56bdb42 pytest:auth_log: expect TLS connections when using ldaps
      from  c4b2930a837 smbd: Fix a use-after-free

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-15-test


- Log -----------------------------------------------------------------
commit 078088833a468977c2f3e5ce1d6d7f358ed94e56
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Thu Dec 23 14:37:29 2021 +1300

    s4/auth/simple_bind: correctly report TLS state
    
    It went wrong in 366f8cf0903e3583fda42696df62a5337f22131f
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at 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
    
    Autobuild-User(v4-15-test): Jule Anger <janger at samba.org>
    Autobuild-Date(v4-15-test): Mon Mar  7 09:28:54 UTC 2022 on sn-devel-184

commit 8fbb56bdb42e0d84a150350876e8d2312438782c
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Wed Jan 26 15:53:45 2022 +1300

    pytest:auth_log: expect TLS connections when using ldaps
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    (cherry picked from commit f37682747898591b37405f9e96a8135c15638637)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14996

-----------------------------------------------------------------------

Summary of changes:
 python/samba/tests/auth_log.py  | 8 ++++----
 source4/auth/ntlm/auth_simple.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/auth_log.py b/python/samba/tests/auth_log.py
index d57d765a83a..d971b48d8e9 100644
--- a/python/samba/tests/auth_log.py
+++ b/python/samba/tests/auth_log.py
@@ -565,7 +565,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
         self.assertEqual("NT_STATUS_OK", msg["Authentication"]["status"])
         self.assertEqual("LDAP",
                           msg["Authentication"]["serviceDescription"])
-        self.assertEqual("simple bind",
+        self.assertEqual("simple bind/TLS",
                           msg["Authentication"]["authDescription"])
         self.assertEqual(
             EVT_ID_SUCCESSFUL_LOGON, msg["Authentication"]["eventId"])
@@ -579,7 +579,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
                     (msg["Authentication"]["status"] ==
                         "NT_STATUS_WRONG_PASSWORD") and
                     (msg["Authentication"]["authDescription"] ==
-                        "simple bind") and
+                        "simple bind/TLS") and
                     (msg["Authentication"]["eventId"] ==
                         EVT_ID_UNSUCCESSFUL_LOGON) and
                     (msg["Authentication"]["logonType"] ==
@@ -611,7 +611,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
                     (msg["Authentication"]["status"] ==
                         "NT_STATUS_NO_SUCH_USER") and
                     (msg["Authentication"]["authDescription"] ==
-                        "simple bind") and
+                        "simple bind/TLS") and
                     (msg["Authentication"]["eventId"] ==
                         EVT_ID_UNSUCCESSFUL_LOGON) and
                     (msg["Authentication"]["logonType"] ==
@@ -641,7 +641,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
                     (msg["Authentication"]["status"] ==
                         "NT_STATUS_NO_SUCH_USER") and
                     (msg["Authentication"]["authDescription"] ==
-                        "simple bind") and
+                        "simple bind/TLS") and
                     (msg["Authentication"]["eventId"] ==
                         EVT_ID_UNSUCCESSFUL_LOGON) and
                     (msg["Authentication"]["logonType"] ==
diff --git a/source4/auth/ntlm/auth_simple.c b/source4/auth/ntlm/auth_simple.c
index 8301aec519c..b2e76381395 100644
--- 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;


-- 
Samba Shared Repository