1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-23 06:50:21 +03:00

s3-auth Use system boolean in auth_user_info_unix

Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Andrew Bartlett 2011-07-15 16:12:41 +10:00
parent e2049e77e4
commit ec5f1b78af
3 changed files with 5 additions and 9 deletions

View File

@ -857,7 +857,7 @@ static NTSTATUS make_new_session_info_system(TALLOC_CTX *mem_ctx,
return status;
}
(*session_info)->system = true;
(*session_info)->unix_info->system = true;
status = add_sid_to_array_unique((*session_info)->security_token->sids,
&global_sid_System,
@ -982,7 +982,7 @@ static struct auth_serversupplied_info *copy_session_info_serverinfo(TALLOC_CTX
SMB_ASSERT(src->unix_info);
dst->guest = src->unix_info->guest;
dst->system = src->system;
dst->system = src->unix_info->system;
/* This element must be provided to convert back to an auth_serversupplied_info */
SMB_ASSERT(src->unix_token);
@ -1043,8 +1043,6 @@ static struct auth3_session_info *copy_serverinfo_session_info(TALLOC_CTX *mem_c
return NULL;
}
dst->system = src->system;
dst->unix_token = talloc(dst, struct security_unix_token);
if (!dst->unix_token) {
return NULL;
@ -1101,6 +1099,7 @@ static struct auth3_session_info *copy_serverinfo_session_info(TALLOC_CTX *mem_c
}
dst->unix_info->guest = src->guest;
dst->unix_info->system = src->system;
return dst;
}
@ -1115,8 +1114,6 @@ struct auth3_session_info *copy_session_info(TALLOC_CTX *mem_ctx,
return NULL;
}
dst->system = src->system;
if (src->unix_token) {
dst->unix_token = talloc(dst, struct security_unix_token);
if (!dst->unix_token) {
@ -1178,6 +1175,7 @@ struct auth3_session_info *copy_session_info(TALLOC_CTX *mem_ctx,
}
dst->unix_info->guest = src->unix_info->guest;
dst->unix_info->system = src->unix_info->system;
}
return dst;

View File

@ -76,8 +76,6 @@ struct auth_serversupplied_info {
};
struct auth3_session_info {
bool system;
struct security_unix_token *unix_token;
/* NT group information taken from the info3 structure */

View File

@ -2702,7 +2702,7 @@ static NTSTATUS get_user_info_18(struct pipes_struct *p,
ZERO_STRUCTP(r);
if (p->session_info->system) {
if (p->session_info->unix_info->system) {
goto query;
}