summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-18 10:14:19 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-20 09:17:12 +1000
commit894fc14a2ebfdf5c9b91f4c3fc2f1fa69300b1bb (patch)
tree28fa0c3efdfc2af57a615e4525a5d2d4c08dc4b2
parentd22ff66afa9215a7a918c33abc55288e4efae8b6 (diff)
downloadsamba-894fc14a2ebfdf5c9b91f4c3fc2f1fa69300b1bb.tar.gz
samba-894fc14a2ebfdf5c9b91f4c3fc2f1fa69300b1bb.tar.bz2
samba-894fc14a2ebfdf5c9b91f4c3fc2f1fa69300b1bb.zip
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>
-rw-r--r--source3/auth/auth_util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index f399acb476..379cdf42ce 100644
--- 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);
}