From fe72740e8221575921c22030d6d4fcb19201b03b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 18 Jul 2012 15:07:23 +0930 Subject: loadparm: make the source3/ lp_ functions take an explicit TALLOC_CTX *. They use talloc_tos() internally: hoist that up to the callers, some of whom don't want to us talloc_tos(). A simple patch, but hits a lot of files. Signed-off-by: Rusty Russell --- source3/auth/auth_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/auth/auth_util.c') diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index b38ee48d7f..b41fac8039 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -47,7 +47,7 @@ static int _smb_create_user(const char *domain, const char *unix_username, const char *add_script; int ret; - add_script = talloc_strdup(ctx, lp_adduser_script()); + add_script = lp_adduser_script(ctx); if (!add_script || !*add_script) { return -1; } @@ -416,8 +416,8 @@ static NTSTATUS log_nt_token(struct security_token *token) char *group_sidstr; size_t i; - if ((lp_log_nt_token_command() == NULL) || - (strlen(lp_log_nt_token_command()) == 0)) { + if ((lp_log_nt_token_command(frame) == NULL) || + (strlen(lp_log_nt_token_command(frame)) == 0)) { TALLOC_FREE(frame); return NT_STATUS_OK; } @@ -430,7 +430,7 @@ static NTSTATUS log_nt_token(struct security_token *token) } command = talloc_string_sub( - frame, lp_log_nt_token_command(), + frame, lp_log_nt_token_command(frame), "%s", sid_string_talloc(frame, &token->sids[0])); command = talloc_string_sub(frame, command, "%t", group_sidstr); -- cgit