diff options
| author | Ralph Boehme <slow@samba.org> | 2019-12-29 14:33:00 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2020-01-13 19:41:34 +0000 |
| commit | bcadd7d798e0cc9bb58835ecac1799dfea8a4cb8 (patch) | |
| tree | b192474fc782f2c3ea14de06170c65e14776299e /source3/smbd/sesssetup.c | |
| parent | 5992f8fa93adfcd6fc9e5c0632fc36f02ce271ca (diff) | |
| download | samba-bcadd7d798e0cc9bb58835ecac1799dfea8a4cb8.tar.gz | |
smbd: use session->global->session_wire_id instead of session->compat->vuid
session->compat->vuid is set to session->global->session_wire_id after a
successful session setup, so both variables will always carry the same value. Cf
the next commit which removes vuid from user_struct.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd/sesssetup.c')
| -rw-r--r-- | source3/smbd/sesssetup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 72fbcf8f418..5826383d5d4 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -355,7 +355,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) if (!session_claim(session)) { DEBUG(1, ("smb1: Failed to claim session for vuid=%llu\n", - (unsigned long long)session->compat->vuid)); + (unsigned long long)session->global->session_wire_id)); data_blob_free(&out_blob); TALLOC_FREE(session); reply_nterror(req, NT_STATUS_LOGON_FAILURE); @@ -365,7 +365,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) status = smbXsrv_session_update(session); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("smb1: Failed to update session for vuid=%llu - %s\n", - (unsigned long long)session->compat->vuid, + (unsigned long long)session->global->session_wire_id, nt_errstr(status))); data_blob_free(&out_blob); TALLOC_FREE(session); @@ -444,7 +444,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) status = smbXsrv_session_update(session); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("smb1: Failed to update session for vuid=%llu - %s\n", - (unsigned long long)session->compat->vuid, + (unsigned long long)session->global->session_wire_id, nt_errstr(status))); data_blob_free(&out_blob); TALLOC_FREE(session); @@ -452,7 +452,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) return; } - conn_clear_vuid_caches(sconn, session->compat->vuid); + conn_clear_vuid_caches(sconn, session->global->session_wire_id); /* current_user_info is changed on new vuid */ reload_services(sconn, conn_snum_used, true); @@ -1110,7 +1110,7 @@ void reply_sesssetup_and_X(struct smb_request *req) nt_status = smbXsrv_session_update(session); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("smb1: Failed to update session for vuid=%llu - %s\n", - (unsigned long long)session->compat->vuid, + (unsigned long long)session->global->session_wire_id, nt_errstr(nt_status))); TALLOC_FREE(session); reply_nterror(req, nt_status_squash(nt_status)); @@ -1120,7 +1120,7 @@ void reply_sesssetup_and_X(struct smb_request *req) if (!session_claim(session)) { DEBUG(1, ("smb1: Failed to claim session for vuid=%llu\n", - (unsigned long long)session->compat->vuid)); + (unsigned long long)session->global->session_wire_id)); TALLOC_FREE(session); reply_nterror(req, NT_STATUS_LOGON_FAILURE); END_PROFILE(SMBsesssetupX); |