From a2ce53c1f5301ffcf990dbab837c328ea22739b6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 8 Feb 2011 16:53:13 +1100 Subject: s4-auth Rework auth subsystem to remove struct auth_serversupplied_info This changes auth_serversupplied_info into the IDL-defined struct auth_user_info_dc. This then in turn contains a struct auth_user_info, which is the only part of the structure that is mainted into the struct session_info. The idea here is to avoid keeping the incomplete results of the authentication (such as session keys, lists of SID memberships etc) in a namespace where it may be confused for the finalised results. Andrew Barltett --- source4/samba_tool/gpo.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/samba_tool/gpo.c') diff --git a/source4/samba_tool/gpo.c b/source4/samba_tool/gpo.c index 93aae60983..46243a07b6 100644 --- a/source4/samba_tool/gpo.c +++ b/source4/samba_tool/gpo.c @@ -208,7 +208,7 @@ static int net_gpo_list(struct net_context *ctx, int argc, const char **argv) { struct gp_context *gp_ctx; struct ldb_result *result; - struct auth_serversupplied_info *server_info; + struct auth_user_info_dc *user_info_dc; struct auth_session_info *session_info; DATA_BLOB dummy = { NULL, 0 }; const char **gpos; @@ -227,7 +227,7 @@ static int net_gpo_list(struct net_context *ctx, int argc, const char **argv) } /* Find the user in the directory. We need extended DN's for group expansion - * in authsam_make_server_info */ + * in authsam_make_user_info_dc */ rv = dsdb_search(gp_ctx->ldb_ctx, gp_ctx, &result, @@ -251,7 +251,7 @@ static int net_gpo_list(struct net_context *ctx, int argc, const char **argv) /* We need the server info, as this will contain the groups of this * user, needed for a token */ - status = authsam_make_server_info(gp_ctx, + status = authsam_make_user_info_dc(gp_ctx, gp_ctx->ldb_ctx, lpcfg_netbios_name(gp_ctx->lp_ctx), lpcfg_sam_name(gp_ctx->lp_ctx), @@ -259,7 +259,7 @@ static int net_gpo_list(struct net_context *ctx, int argc, const char **argv) result->msgs[0], dummy, dummy, - &server_info); + &user_info_dc); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Failed to make server information: %s\n", get_friendly_nt_error_msg(status))); talloc_free(gp_ctx); @@ -267,7 +267,7 @@ static int net_gpo_list(struct net_context *ctx, int argc, const char **argv) } /* The session info will contain the security token for this user */ - status = auth_generate_session_info(gp_ctx, gp_ctx->lp_ctx, gp_ctx->ldb_ctx, server_info, 0, &session_info); + status = auth_generate_session_info(gp_ctx, gp_ctx->lp_ctx, gp_ctx->ldb_ctx, user_info_dc, 0, &session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Failed to generate session information: %s\n", get_friendly_nt_error_msg(status))); talloc_free(gp_ctx); -- cgit