diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-26 13:37:36 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-08-03 18:48:04 +1000 |
| commit | 9a45bf39527d9c2dcd8d2debf214196100a3efce (patch) | |
| tree | 080e2c9bc12348cd4a7f96f5ce9deb1cc55ed741 /source3/smbd/sesssetup.c | |
| parent | 8b983d232648944c18fe878a3ace0f58658ec24d (diff) | |
| download | samba-9a45bf39527d9c2dcd8d2debf214196100a3efce.tar.gz samba-9a45bf39527d9c2dcd8d2debf214196100a3efce.tar.bz2 samba-9a45bf39527d9c2dcd8d2debf214196100a3efce.zip | |
s3-auth set session_info->sanitized_username in create_local_token()
Rather than passing this value around the callers, and eventually
setting it in register_existing_vuid(), we simply pass it to
create_local_token(). This also removes the need for
auth_ntlmssp_get_username().
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/smbd/sesssetup.c')
| -rw-r--r-- | source3/smbd/sesssetup.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 20b31096b0..683f6b2c15 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -367,7 +367,7 @@ static void reply_spnego_kerberos(struct smb_request *req, * it.... */ sess_vuid = register_existing_vuid(sconn, sess_vuid, - session_info, nullblob, user); + session_info, nullblob); reply_outbuf(req, 4, 0); SSVAL(req->outbuf,smb_uid,sess_vuid); @@ -448,8 +448,7 @@ static void reply_spnego_ntlmssp(struct smb_request *req, /* register_existing_vuid keeps the server info */ if (register_existing_vuid(sconn, vuid, - session_info, nullblob, - auth_ntlmssp_get_username(*auth_ntlmssp_state)) != + session_info, nullblob) != vuid) { /* The problem is, *auth_ntlmssp_state points * into the vuser this will have @@ -1641,7 +1640,7 @@ void reply_sesssetup_and_X(struct smb_request *req) return; } - nt_status = create_local_token(req, server_info, NULL, &session_info); + nt_status = create_local_token(req, server_info, NULL, sub_user, &session_info); TALLOC_FREE(server_info); if (!NT_STATUS_IS_OK(nt_status)) { @@ -1688,8 +1687,7 @@ void reply_sesssetup_and_X(struct smb_request *req) /* register_existing_vuid keeps the session_info */ sess_vuid = register_existing_vuid(sconn, sess_vuid, session_info, - nt_resp.data ? nt_resp : lm_resp, - sub_user); + nt_resp.data ? nt_resp : lm_resp); if (sess_vuid == UID_FIELD_INVALID) { data_blob_free(&nt_resp); data_blob_free(&lm_resp); |