diff options
Diffstat (limited to 'source4/scripting/libjs')
-rw-r--r-- | source4/scripting/libjs/auth.js | 3 | ||||
-rw-r--r-- | source4/scripting/libjs/management.js | 3 | ||||
-rw-r--r-- | source4/scripting/libjs/provision.js | 16 |
3 files changed, 14 insertions, 8 deletions
diff --git a/source4/scripting/libjs/auth.js b/source4/scripting/libjs/auth.js index a973cb4753..73d8645218 100644 --- a/source4/scripting/libjs/auth.js +++ b/source4/scripting/libjs/auth.js @@ -11,7 +11,8 @@ function getDomainList() { var ret = new Array(2); + var lp = loadparm_init(); ret[0] = "System User"; - ret[1] = lpGet("workgroup"); + ret[1] = lp.get("workgroup"); return ret; } diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js index 7130cdc5dd..e1c68ca1de 100644 --- a/source4/scripting/libjs/management.js +++ b/source4/scripting/libjs/management.js @@ -97,7 +97,8 @@ function nbtd_statistics() */ function service_enabled(name) { - var services = lpGet("server services"); + var lp = loadparm_init(); + var services = lp.get("server services"); var i; for (i=0;i<services.length;i++) { if (services[i] == name) { diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index d3b94c1d1c..e9a8aad0cc 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -141,13 +141,14 @@ function setup_ldb(ldif, dbname, subobj) { var extra = ""; var ldb = ldb_init(); + var lp = loadparm_init(); if (arguments.length == 4) { extra = arguments[3]; } var dbfile = dbname; - var src = lpGet("setup directory") + "/" + ldif; + var src = lp.get("setup directory") + "/" + ldif; var data = sys.file_load(src); data = data + extra; @@ -167,8 +168,9 @@ function setup_ldb(ldif, dbname, subobj) */ function setup_file(template, fname, subobj) { - var f = lpGet("private dir") + "/" + fname; - var src = lpGet("setup directory") + "/" + template; + var lp = loadparm_init(); + var f = lp.get("private dir") + "/" + fname; + var src = lp.get("setup directory") + "/" + template; sys.unlink(f); @@ -221,9 +223,10 @@ function provision_guess() { var subobj = new Object(); var nss = nss_init(); + var lp = loadparm_init(); - subobj.REALM = lpGet("realm"); - subobj.DOMAIN = lpGet("workgroup"); + subobj.REALM = lp.get("realm"); + subobj.DOMAIN = lp.get("workgroup"); subobj.HOSTNAME = hostname(); subobj.HOSTIP = hostip(); subobj.DOMAINGUID = randguid(); @@ -271,7 +274,8 @@ function searchone(ldb, expression, attribute) */ function newuser(username, unixname, password, message) { - var samdb = lpGet("sam database"); + var lp = loadparm_init(); + var samdb = lp.get("sam database"); var ldb = ldb_init(); /* connect to the sam */ |