diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-15 15:55:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-20 09:17:11 +1000 |
| commit | 92895379934b660affa70cd406e40719d429ae2a (patch) | |
| tree | 6a6185b2e0476a7045535332fad6201caeda2424 /source3/smbd/uid.c | |
| parent | a39187f0f5e6f99ce8a38cba997e4ad15353e09e (diff) | |
| download | samba-92895379934b660affa70cd406e40719d429ae2a.tar.gz samba-92895379934b660affa70cd406e40719d429ae2a.tar.bz2 samba-92895379934b660affa70cd406e40719d429ae2a.zip | |
s3-auth Use struct auth_user_info_unix for unix_name and sanitized_username
This is closer to the layout of struct auth_session_info in auth.idl
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/smbd/uid.c')
| -rw-r--r-- | source3/smbd/uid.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index b6ea7674b1..47c9786116 100644 --- a/source3/smbd/uid.c +++ b/source3/smbd/uid.c @@ -109,13 +109,13 @@ static bool check_user_ok(connection_struct *conn, } } - if (!user_ok_token(session_info->unix_name, + if (!user_ok_token(session_info->unix_info->unix_name, session_info->info3->base.domain.string, session_info->security_token, snum)) return(False); readonly_share = is_share_read_only_for_token( - session_info->unix_name, + session_info->unix_info->unix_name, session_info->info3->base.domain.string, session_info->security_token, conn); @@ -140,7 +140,7 @@ static bool check_user_ok(connection_struct *conn, } admin_user = token_contains_name_in_list( - session_info->unix_name, + session_info->unix_info->unix_name, session_info->info3->base.domain.string, NULL, session_info->security_token, lp_admin_users(snum)); @@ -176,7 +176,7 @@ static bool check_user_ok(connection_struct *conn, if (admin_user) { DEBUG(2,("check_user_ok: user %s is an admin user. " "Setting uid as %d\n", - conn->session_info->unix_name, + conn->session_info->unix_info->unix_name, sec_initial_uid() )); conn->session_info->unix_token->uid = sec_initial_uid(); } @@ -207,8 +207,8 @@ static bool change_to_user_internal(connection_struct *conn, if (!ok) { DEBUG(2,("SMB user %s (unix user %s) " "not permitted access to share %s.\n", - session_info->sanitized_username, - session_info->unix_name, + session_info->unix_info->sanitized_username, + session_info->unix_info->unix_name, lp_servicename(snum))); return false; } |