3 files changed, 7 insertions, 7 deletions
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);
 
diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index c4da1e676c..87fa8ca9fa 100644
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -299,7 +299,7 @@ static int smb_pam_passchange_conv(int num_msg,
 	if (num_msg <= 0)
 		return PAM_CONV_ERR;
 
-	if ((pw_chat = make_pw_chat(lp_passwd_chat())) == NULL)
+	if ((pw_chat = make_pw_chat(lp_passwd_chat(talloc_tos()))) == NULL)
 		return PAM_CONV_ERR;
 
 	/*
diff --git a/source3/auth/user_util.c b/source3/auth/user_util.c
index d982c746c6..8938aeb003 100644
--- a/source3/auth/user_util.c
+++ b/source3/auth/user_util.c
@@ -267,11 +267,11 @@ bool user_in_list(TALLOC_CTX *ctx, const char *user,const char **list)
 bool map_username(TALLOC_CTX *ctx, const char *user_in, char **p_user_out)
 {
 	XFILE *f;
-	char *mapfile = lp_username_map();
+	char *mapfile = lp_username_map(talloc_tos());
 	char *s;
 	char buf[512];
 	bool mapped_user = False;
-	char *cmd = lp_username_map_script();
+	char *cmd = lp_username_map_script(talloc_tos());
 
 	*p_user_out = NULL;