s3-auth Clarify inputs and ouptuts by using elements from server_info

This allows us not the put all of these elements into the auth3_session_info
if they are only used as inputs to these functions.

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index f399acb4766ec14143e033b4423da0386b912314..379cdf42ceaefd1c7e660e05045e296a2ba27b4b 100644 (file)
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -507,8 +507,8 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
        if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) ||
            (server_info->nss_token)) {
                status = create_token_from_username(session_info,
-                                                   session_info->unix_info->unix_name,
-                                                   session_info->unix_info->guest,
+                                                   server_info->unix_name,
+                                                   server_info->guest,
                                                    &session_info->unix_token->uid,
                                                    &session_info->unix_token->gid,
                                                    &session_info->unix_info->unix_name,
@@ -516,9 +516,9 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
 
        } else {
                status = create_local_nt_token_from_info3(session_info,
-                                                         session_info->unix_info->guest,
-                                                         session_info->info3,
-                                                         &session_info->extra,
+                                                         server_info->guest,
+                                                         server_info->info3,
+                                                         &server_info->extra,
                                                          &session_info->security_token);
        }