From 6bea5bea4ccd4eb45b9cd4dd1e16538b14e2180e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 26 Sep 2004 01:43:05 +0000 Subject: r2643: convert more of the auth subsyystem to the new talloc methods. This also fixes a memory leak found with --leak-check. (This used to be commit f19201ea274f0a542314c61c4af676197bf154ad) --- source4/auth/auth.h | 4 ---- source4/auth/auth_sam.c | 24 ++++++++++++------------ source4/auth/auth_util.c | 22 ++++++++-------------- 3 files changed, 20 insertions(+), 30 deletions(-) (limited to 'source4/auth') diff --git a/source4/auth/auth.h b/source4/auth/auth.h index 74df97a2ed..6f2c7134e7 100644 --- a/source4/auth/auth.h +++ b/source4/auth/auth.h @@ -58,8 +58,6 @@ struct auth_usersupplied_info struct auth_serversupplied_info { - TALLOC_CTX *mem_ctx; - BOOL guest; struct dom_sid *user_sid; @@ -95,8 +93,6 @@ struct auth_serversupplied_info struct auth_session_info { - TALLOC_CTX *mem_ctx; - int refcount; /* NT group information taken from the info3 structure */ diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c index 5239d6f413..74c8edcb82 100644 --- a/source4/auth/auth_sam.c +++ b/source4/auth/auth_sam.c @@ -332,19 +332,19 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context, if (group_ret > 0 && !(groupSIDs = talloc_realloc_p(groupSIDs, struct dom_sid *, group_ret))) { - talloc_destroy((*server_info)->mem_ctx); + talloc_free(*server_info); return NT_STATUS_NO_MEMORY; } /* Need to unroll some nested groups, but not aliases */ for (i = 0; i < group_ret; i++) { sidstr = ldb_msg_find_string(group_msgs[i], "objectSid", NULL); - groupSIDs[i] = dom_sid_parse_talloc((*server_info)->mem_ctx, sidstr); + groupSIDs[i] = dom_sid_parse_talloc(*server_info, sidstr); } sidstr = ldb_msg_find_string(msgs[0], "objectSid", NULL); - user_sid = dom_sid_parse_talloc((*server_info)->mem_ctx, sidstr); - primary_group_sid = dom_sid_parse_talloc((*server_info)->mem_ctx, sidstr); + user_sid = dom_sid_parse_talloc(*server_info, sidstr); + primary_group_sid = dom_sid_parse_talloc(*server_info, sidstr); primary_group_sid->sub_auths[primary_group_sid->num_auths-1] = samdb_result_uint(msgs[0], "primaryGroupID", 0); @@ -356,29 +356,29 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context, } (*server_info)->account_name - = talloc_strdup((*server_info)->mem_ctx, + = talloc_strdup(*server_info, samdb_result_string(msgs[0], "sAMAccountName", "")); (*server_info)->domain - = talloc_strdup((*server_info)->mem_ctx, + = talloc_strdup(*server_info, samdb_result_string(msgs_domain[0], "name", "")); (*server_info)->full_name - = talloc_strdup((*server_info)->mem_ctx, + = talloc_strdup(*server_info, samdb_result_string(msgs[0], "displayName", "")); (*server_info)->logon_script - = talloc_strdup((*server_info)->mem_ctx, + = talloc_strdup(*server_info, samdb_result_string(msgs[0], "scriptPath", "")); (*server_info)->profile_path - = talloc_strdup((*server_info)->mem_ctx, + = talloc_strdup(*server_info, samdb_result_string(msgs[0], "profilePath", "")); (*server_info)->home_directory - = talloc_strdup((*server_info)->mem_ctx, + = talloc_strdup(*server_info, samdb_result_string(msgs[0], "homeDirectory", "")); (*server_info)->home_drive - = talloc_strdup((*server_info)->mem_ctx, + = talloc_strdup(*server_info, samdb_result_string(msgs[0], "homeDrive", "")); (*server_info)->last_logon = samdb_result_nttime(msgs[0], "lastLogon", 0); @@ -408,7 +408,7 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context, || !(*server_info)->profile_path || !(*server_info)->home_directory || !(*server_info)->home_drive) { - talloc_destroy((*server_info)->mem_ctx); + talloc_destroy(*server_info); return NT_STATUS_NO_MEMORY; } diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c index 3c77faefe1..ab725249c7 100644 --- a/source4/auth/auth_util.c +++ b/source4/auth/auth_util.c @@ -402,15 +402,12 @@ NTSTATUS create_nt_user_token(TALLOC_CTX *mem_ctx, NTSTATUS make_server_info(struct auth_serversupplied_info **server_info, const char *username) { - TALLOC_CTX *mem_ctx = talloc_init("auth subsystem: server_info for %s", username); - *server_info = talloc_p(mem_ctx, struct auth_serversupplied_info); + *server_info = talloc_p(NULL, struct auth_serversupplied_info); if (!*server_info) { DEBUG(0,("make_server_info: malloc failed!\n")); - talloc_destroy(mem_ctx); return NT_STATUS_NO_MEMORY; } ZERO_STRUCTP(*server_info); - (*server_info)->mem_ctx = mem_ctx; return NT_STATUS_OK; } @@ -431,8 +428,8 @@ NTSTATUS make_server_info_guest(struct auth_serversupplied_info **server_info) (*server_info)->guest = True; - (*server_info)->user_sid = dom_sid_parse_talloc((*server_info)->mem_ctx, SID_ANONYMOUS); - (*server_info)->primary_group_sid = dom_sid_parse_talloc((*server_info)->mem_ctx, SID_BUILTIN_GUESTS); + (*server_info)->user_sid = dom_sid_parse_talloc((*server_info), SID_ANONYMOUS); + (*server_info)->primary_group_sid = dom_sid_parse_talloc((*server_info), SID_BUILTIN_GUESTS); (*server_info)->n_domain_groups = 0; (*server_info)->domain_groups = NULL; @@ -495,8 +492,8 @@ void free_user_info(struct auth_usersupplied_info **user_info) void free_server_info(struct auth_serversupplied_info **server_info) { DEBUG(5,("attempting to free a server_info structure\n")); - if (!*server_info) { - talloc_destroy((*server_info)->mem_ctx); + if (*server_info) { + talloc_free(*server_info); } *server_info = NULL; } @@ -530,15 +527,12 @@ NTSTATUS make_session_info(struct auth_serversupplied_info *server_info, { NTSTATUS nt_status; - *session_info = talloc_p(server_info->mem_ctx, struct auth_session_info); + *session_info = talloc_p(server_info, struct auth_session_info); if (!*session_info) { return NT_STATUS_NO_MEMORY; } (*session_info)->refcount = 1; - (*session_info)->mem_ctx = server_info->mem_ctx; - server_info->mem_ctx = NULL; /* make sure not to accidentily destory it, - and this information is now constant */ (*session_info)->server_info = server_info; /* unless set otherwise, the session key is the user session @@ -546,7 +540,7 @@ NTSTATUS make_session_info(struct auth_serversupplied_info *server_info, (*session_info)->session_key = server_info->user_session_key; - nt_status = create_nt_user_token((*session_info)->mem_ctx, + nt_status = create_nt_user_token((*session_info), server_info->user_sid, server_info->primary_group_sid, server_info->n_domain_groups, @@ -567,7 +561,7 @@ void free_session_info(struct auth_session_info **session_info) if (*session_info) { (*session_info)->refcount--; if ((*session_info)->refcount <= 0) { - talloc_destroy((*session_info)->mem_ctx); + talloc_free((*session_info)); } } *session_info = NULL; -- cgit