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

diff --git a/selftest/knownfail b/selftest/knownfail
index 44acf76e8af90e2fa0d337d9af1d1a82987ce58d..2cc9c70f1d60224714cf27e67e29f15a5d7bcaa1 100644 (file)
--- 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 2ed5a4c7ed7f38091db4d6936ce688c68961c54a..a44af7fc30bf28f5d28992b7f17ed79983059e2d 100644 (file)
--- 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);
                }