From dd7e5ed88c48f4ee39e53be07c8839791e914e45 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 8 Dec 2007 23:32:37 +0100 Subject: r26352: Don't make lp_load create a new context. (This used to be commit d0d5c1a823a6601292c061dba2b6f4bde2b9e3dd) --- source4/scripting/libjs/provision.js | 2 +- source4/scripting/libjs/upgrade.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/scripting/libjs') diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index 7d77bf7885..f9814884f3 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -386,7 +386,7 @@ function provision_default_paths(subobj) var dnsdomain = strlower(subobj.REALM); var lp = loadparm_init(); var paths = new Object(); - paths.smbconf = lp.get("config file"); + paths.smbconf = lp.filename() paths.shareconf = lp.get("private dir") + "/" + "share.ldb"; paths.samdb = lp.get("sam database"); paths.secrets = lp.get("secrets database"); diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js index 3504d850f2..3a548fe34b 100644 --- a/source4/scripting/libjs/upgrade.js +++ b/source4/scripting/libjs/upgrade.js @@ -468,7 +468,6 @@ smbconf_keep = new Array( "wins support", "csc policy", "strict locking", - "config file", "preload", "auto services", "lock dir", -- cgit