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/smb2_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/smb2_sesssetup.c')
| -rw-r--r-- | source3/smbd/smb2_sesssetup.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index 7bc8692758..45acff2778 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -174,7 +174,6 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session, struct passwd *pw = NULL; NTSTATUS status; char *real_username; - fstring tmp; bool username_was_mapped = false; bool map_domainuser_to_guest = false; @@ -256,11 +255,6 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session, session->compat_vuser->vuid = session->vuid; DLIST_ADD(session->sconn->smb1.sessions.validated_users, session->compat_vuser); - /* This is a potentially untrusted username */ - alpha_strcpy(tmp, user, ". _-$", sizeof(tmp)); - session->session_info->unix_info->sanitized_username = - talloc_strdup(session->session_info, tmp); - if (security_session_user_level(session->session_info, NULL) >= SECURITY_USER) { session->compat_vuser->homes_snum = register_homes_share(session->session_info->unix_info->unix_name); @@ -442,8 +436,6 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct smbd_smb2_session *s uint16_t *out_session_flags, uint64_t *out_session_id) { - fstring tmp; - if ((in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) || lp_server_signing() == Required) { session->do_signing = true; @@ -472,14 +464,6 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct smbd_smb2_session *s session->compat_vuser->vuid = session->vuid; DLIST_ADD(session->sconn->smb1.sessions.validated_users, session->compat_vuser); - /* This is a potentially untrusted username */ - alpha_strcpy(tmp, - auth_ntlmssp_get_username(session->auth_ntlmssp_state), - ". _-$", - sizeof(tmp)); - session->session_info->unix_info->sanitized_username = talloc_strdup( - session->session_info, tmp); - if (security_session_user_level(session->session_info, NULL) >= SECURITY_USER) { session->compat_vuser->homes_snum = register_homes_share(session->session_info->unix_info->unix_name); |