From 2d8be31e880bcd1b7444ffd45295cc9948079b6f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 25 Sep 2010 14:51:45 -0700 Subject: s3: Lift talloc_autofree_context() from make_auth_context_text_list() --- source3/auth/auth.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'source3/auth/auth.c') diff --git a/source3/auth/auth.c b/source3/auth/auth.c index a22c223e13..8a3e3497be 100644 --- a/source3/auth/auth.c +++ b/source3/auth/auth.c @@ -421,7 +421,9 @@ bool load_auth_module(struct auth_context *auth_context, Make a auth_info struct for the auth subsystem ***************************************************************************/ -static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context, char **text_list) +static NTSTATUS make_auth_context_text_list(TALLOC_CTX *mem_ctx, + struct auth_context **auth_context, + char **text_list) { auth_methods *list = NULL; auth_methods *t = NULL; @@ -432,7 +434,7 @@ static NTSTATUS make_auth_context_text_list(struct auth_context **auth_context, return NT_STATUS_UNSUCCESSFUL; } - nt_status = make_auth_context(talloc_autofree_context(), auth_context); + nt_status = make_auth_context(mem_ctx, auth_context); if (!NT_STATUS_IS_OK(nt_status)) { return nt_status; @@ -524,7 +526,8 @@ NTSTATUS make_auth_context_subsystem(struct auth_context **auth_context) DEBUG(5,("Using specified auth order\n")); } - nt_status = make_auth_context_text_list(auth_context, + nt_status = make_auth_context_text_list(talloc_autofree_context(), + auth_context, auth_method_list); TALLOC_FREE(auth_method_list); -- cgit