summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-09-25 14:51:45 -0700
committerVolker Lendecke <vl@samba.org>2010-09-26 01:12:37 +0200
commit2d8be31e880bcd1b7444ffd45295cc9948079b6f (patch)
tree279c616156f851c3ebde5fd82b15dd2ec0a950af
parent61861e4b7d37d5b483360c0e9faa3dd3a1d0e9f6 (diff)
downloadsamba-2d8be31e880bcd1b7444ffd45295cc9948079b6f.tar.gz
samba-2d8be31e880bcd1b7444ffd45295cc9948079b6f.tar.bz2
samba-2d8be31e880bcd1b7444ffd45295cc9948079b6f.zip
s3: Lift talloc_autofree_context() from make_auth_context_text_list()
-rw-r--r--source3/auth/auth.c9
1 files changed, 6 insertions, 3 deletions
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);