summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Lockyer <gary@catalyst.net.nz>2017-04-27 12:39:34 +1200
committerJeremy Allison <jra@samba.org>2017-04-28 07:18:54 +0200
commitaa43d0d81baa497135a17e843b05336b4a504809 (patch)
treece64dc270b683195b347993169a5fda661f03d77
parent85e98d2a3190653af56b1adb7597a903b8dec83b (diff)
downloadsamba-aa43d0d81baa497135a17e843b05336b4a504809.tar.gz
source3 smdb: fix null pointer dereference
Fix the null pointer dereference in smbd, introduced in the auth logging changes. Signed-off-by: Gary Lockyer <gary@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Fri Apr 28 07:18:54 CEST 2017 on sn-devel-144
-rw-r--r--selftest/knownfail2
-rw-r--r--source3/smbd/sesssetup.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index 44acf76e8af..2cc9c70f1d6 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -329,5 +329,3 @@
# We currently don't send referrals for LDAP modify of non-replicated attrs
^samba4.ldap.rodc.python\(rodc\).__main__.RodcTests.test_modify_nonreplicated.*
^samba4.ldap.rodc_rwdc.python.*.__main__.RodcRwdcTests.test_change_password_reveal_on_demand_kerberos
-# Test to detect null pointer issue in sessetup.c
-^samba.tests.net_join_no_spnego.*
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 2ed5a4c7ed7..a44af7fc30b 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -908,9 +908,9 @@ void reply_sesssetup_and_X(struct smb_request *req)
sconn->local_address,
"SMB",
lm_resp, nt_resp);
- user_info->auth_description = "bare-NTLM";
if (NT_STATUS_IS_OK(nt_status)) {
+ user_info->auth_description = "bare-NTLM";
nt_status = auth_check_password_session_info(negprot_auth_context,
req, user_info, &session_info);
}