From a48fdda5fec99649e29760c7a9c91246438c9579 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 8 Dec 2007 23:31:41 +0100 Subject: r26339: Make loadparm talloc-allocated. (This used to be commit 1e02cd8db1d65ff72b747833904a10b47749b1fb) --- source4/lib/cmdline/popt_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/lib/cmdline') diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c index b95dfdebc4..aae22e00c3 100644 --- a/source4/lib/cmdline/popt_common.c +++ b/source4/lib/cmdline/popt_common.c @@ -64,9 +64,9 @@ static void popt_samba_callback(poptContext con, if (reason == POPT_CALLBACK_REASON_POST) { if (!lp_loaded()) { if (getenv("SMB_CONF_PATH")) - lp_load(getenv("SMB_CONF_PATH"), NULL); + lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), NULL); else - lp_load(dyn_CONFIGFILE, NULL); + lp_load(talloc_autofree_context(), dyn_CONFIGFILE, NULL); } /* Hook any 'every Samba program must do this, after * the smb.conf is setup' functions here */ @@ -120,7 +120,7 @@ static void popt_samba_callback(poptContext con, case 's': if (arg) { - lp_load(arg, NULL); + lp_load(talloc_autofree_context(), arg, NULL); } break; -- cgit