From 75724d9eb14cd288297f3f5228fb3d10a11861dc Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 20 Oct 2012 07:20:39 +0200 Subject: [PATCH] s3: Use talloc_stackframe in token_contains_name_in_list --- source3/smbd/share_access.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c index 7087a985a97..aa3bd3965cb 100644 --- a/source3/smbd/share_access.c +++ b/source3/smbd/share_access.c @@ -162,26 +162,21 @@ bool token_contains_name_in_list(const char *username, const struct security_token *token, const char **list) { - TALLOC_CTX *mem_ctx; - if (list == NULL) { return False; } - - if ( (mem_ctx = talloc_new(NULL)) == NULL ) { - smb_panic("talloc_new failed"); - } - while (*list != NULL) { - if (token_contains_name(mem_ctx, username, domain, sharename, - token, *list)) { - TALLOC_FREE(mem_ctx); - return True; + TALLOC_CTX *frame = talloc_stackframe(); + bool ret; + + ret = token_contains_name(frame, username, domain, sharename, + token, *list); + TALLOC_FREE(frame); + if (ret) { + return true; } list += 1; } - - TALLOC_FREE(mem_ctx); return False; } -- 2.11.4.GIT