From fd88c3ca2480fabb90c0d8fc701394bb59f99481 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 8 Dec 2007 23:32:18 +0100 Subject: r26348: Avoid use of autofree context. (This used to be commit eebcf7e1b06ca48cc53bdd12efa01fcf0cff8aa3) --- source4/param/loadparm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/param/loadparm.c') diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 32aaa13b87..19f5b8b6ca 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -888,16 +888,16 @@ const char *lp_parm_string(struct loadparm_context *lp_ctx, /* Parametric option has following syntax: 'Type: option = value' */ /* Returned value is allocated in 'lp_talloc' context */ -const char **lp_parm_string_list(struct loadparm_context *lp_ctx, +const char **lp_parm_string_list(TALLOC_CTX *mem_ctx, + struct loadparm_context *lp_ctx, struct loadparm_service *service, const char *type, const char *option, const char *separator) { const char *value = lp_get_parametric(lp_ctx, service, type, option); - if (value) - return str_list_make(talloc_autofree_context(), value, - separator); + if (value != NULL) + return str_list_make(mem_ctx, value, separator); return NULL; } -- cgit