s3-auth Use struct auth_user_info_unix for unix_name and sanitized_username

[ab/samba.git/.git] / source3 / smbd / uid.c

diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index b6ea7674b1389d70fd137848e15a41b6ba8314ed..47c9786116e02b9da7064e8b2e49a0ee133ecd43 100644 (file)
--- 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;
        }