From 4d50c751595511936c3d9a44ebb26a925c50a8bc Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 27 Mar 2014 09:17:15 +1300 Subject: s3-auth: Finally change make_user_info_*() use a parent talloc context Change-Id: Iedf516e8c24e0d18064aeedd8e287ed692d3c5b4 Signed-off-by: Andrew Bartlett Reviewed-by: David Disseldorp --- source3/auth/user_info.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'source3/auth/user_info.c') diff --git a/source3/auth/user_info.c b/source3/auth/user_info.c index 61367f959bb..0d5176d2b1f 100644 --- a/source3/auth/user_info.c +++ b/source3/auth/user_info.c @@ -41,7 +41,8 @@ static int clear_string(char *password) Create an auth_usersupplied_data structure ****************************************************************************/ -NTSTATUS make_user_info(struct auth_usersupplied_info **ret_user_info, +NTSTATUS make_user_info(TALLOC_CTX *mem_ctx, + struct auth_usersupplied_info **ret_user_info, const char *smb_name, const char *internal_username, const char *client_domain, @@ -60,10 +61,7 @@ NTSTATUS make_user_info(struct auth_usersupplied_info **ret_user_info, DEBUG(5,("attempting to make a user_info for %s (%s)\n", internal_username, smb_name)); - /* FIXME: Have the caller provide a talloc context of the - * correct lifetime (possibly talloc_tos(), but it depends on - * the caller) */ - user_info = talloc_zero(NULL, struct auth_usersupplied_info); + user_info = talloc_zero(mem_ctx, struct auth_usersupplied_info); if (user_info == NULL) { DEBUG(0,("talloc failed for user_info\n")); return NT_STATUS_NO_MEMORY; @@ -162,12 +160,3 @@ NTSTATUS make_user_info(struct auth_usersupplied_info **ret_user_info, *ret_user_info = user_info; return NT_STATUS_OK; } - -/*************************************************************************** - Free a user_info struct -***************************************************************************/ - -void free_user_info(struct auth_usersupplied_info **user_info) -{ - TALLOC_FREE(*user_info); -} -- cgit