svn commit: samba r8639 - in branches/SAMBA_4_0:
source/scripting/bin source/scripting/ejs
source/scripting/libjs swat/esptest testprogs/ejs
tridge at samba.org
tridge at samba.org
Wed Jul 20 07:20:04 GMT 2005
Author: tridge
Date: 2005-07-20 07:20:03 +0000 (Wed, 20 Jul 2005)
New Revision: 8639
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8639
Log:
moved loadparm calls into an ejs object
Modified:
branches/SAMBA_4_0/source/scripting/bin/smbstatus
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c
branches/SAMBA_4_0/source/scripting/libjs/auth.js
branches/SAMBA_4_0/source/scripting/libjs/management.js
branches/SAMBA_4_0/source/scripting/libjs/provision.js
branches/SAMBA_4_0/swat/esptest/ldb.esp
branches/SAMBA_4_0/swat/esptest/loadparm.esp
branches/SAMBA_4_0/testprogs/ejs/loadparm.js
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/bin/smbstatus
===================================================================
--- branches/SAMBA_4_0/source/scripting/bin/smbstatus 2005-07-20 07:04:07 UTC (rev 8638)
+++ branches/SAMBA_4_0/source/scripting/bin/smbstatus 2005-07-20 07:20:03 UTC (rev 8639)
@@ -82,8 +82,10 @@
println("");
}
-printf("%s\n\n", lpGet("server string"));
+var lp = loadparm_init();
+printf("%s\n\n", lp.get("server string"));
+
if (options['nbt'] != undefined) {
show_nbt();
} else {
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c 2005-07-20 07:04:07 UTC (rev 8638)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c 2005-07-20 07:20:03 UTC (rev 8639)
@@ -140,10 +140,21 @@
}
/*
+ initialise loadparm ejs subsystem
+*/
+static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv)
+{
+ struct MprVar *obj = mprInitObject(eid, "loadparm", argc, argv);
+
+ mprSetStringCFunction(obj, "get", ejs_lpGet);
+ mprSetStringCFunction(obj, "services", ejs_lpServices);
+ return 0;
+}
+
+/*
setup C functions that be called from ejs
*/
void smb_setup_ejs_config(void)
{
- ejsDefineStringCFunction(-1, "lpGet", ejs_lpGet, NULL, MPR_VAR_SCRIPT_HANDLE);
- ejsDefineStringCFunction(-1, "lpServices", ejs_lpServices, NULL, MPR_VAR_SCRIPT_HANDLE);
+ ejsDefineCFunction(-1, "loadparm_init", ejs_loadparm_init, NULL, MPR_VAR_SCRIPT_HANDLE);
}
Modified: branches/SAMBA_4_0/source/scripting/libjs/auth.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/auth.js 2005-07-20 07:04:07 UTC (rev 8638)
+++ branches/SAMBA_4_0/source/scripting/libjs/auth.js 2005-07-20 07:20:03 UTC (rev 8639)
@@ -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;
}
Modified: branches/SAMBA_4_0/source/scripting/libjs/management.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/management.js 2005-07-20 07:04:07 UTC (rev 8638)
+++ branches/SAMBA_4_0/source/scripting/libjs/management.js 2005-07-20 07:20:03 UTC (rev 8639)
@@ -97,7 +97,8 @@
*/
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) {
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2005-07-20 07:04:07 UTC (rev 8638)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2005-07-20 07:20:03 UTC (rev 8639)
@@ -141,13 +141,14 @@
{
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_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 @@
{
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 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 */
Modified: branches/SAMBA_4_0/swat/esptest/ldb.esp
===================================================================
--- branches/SAMBA_4_0/swat/esptest/ldb.esp 2005-07-20 07:04:07 UTC (rev 8638)
+++ branches/SAMBA_4_0/swat/esptest/ldb.esp 2005-07-20 07:20:03 UTC (rev 8639)
@@ -5,7 +5,8 @@
<h3>An attribute constrained search</h3>
<%
-var dbfile = lpGet("sam database");
+var lp = loadparm_init();
+var dbfile = lp.get("sam database");
var attrs = new Array("name", "dnsDomain", "objectSid", "dn");
var ldb = ldb_init();
var ok = ldb.connect(dbfile);
Modified: branches/SAMBA_4_0/swat/esptest/loadparm.esp
===================================================================
--- branches/SAMBA_4_0/swat/esptest/loadparm.esp 2005-07-20 07:04:07 UTC (rev 8638)
+++ branches/SAMBA_4_0/swat/esptest/loadparm.esp 2005-07-20 07:20:03 UTC (rev 8639)
@@ -3,6 +3,8 @@
<h1>Samba4 loadparm test</h1>
<%
+lp = loadparm_init();
+
var f = FormObj("LoadparmTest", 2, 1);
f.element[0].label = "Share";
f.element[1].label = "Parameter";
@@ -41,9 +43,9 @@
share = form['Share'];
name = form['Parameter'];
if (share && name) {
- v = lpGet(share, name);
+ v = lp.get(share, name);
} else if (name) {
- v = lpGet(name);
+ v = lp.get(name);
}
showValue(name, v);
@@ -53,11 +55,10 @@
Here are some commonly used parameters:<p>
<%
+showValue("defined services", lp.services());
-showValue("defined services", lpServices());
-
function showParameter(name) {
- showValue(name, lpGet(name));
+ showValue(name, lp.get(name));
}
showParameter("server services");
Modified: branches/SAMBA_4_0/testprogs/ejs/loadparm.js
===================================================================
--- branches/SAMBA_4_0/testprogs/ejs/loadparm.js 2005-07-20 07:04:07 UTC (rev 8638)
+++ branches/SAMBA_4_0/testprogs/ejs/loadparm.js 2005-07-20 07:20:03 UTC (rev 8639)
@@ -2,9 +2,11 @@
demonstrate access to loadparm functions from ejs
*/
+loadparm_init(local);
+
function showParameter(name) {
print(name + ": ");
- printVars(lpGet(name));
+ printVars(get(name));
}
for (v in ARGV) {
@@ -12,7 +14,7 @@
}
print("defined services: ");
-printVars(lpServices());
+printVars(services());
showParameter("server services");
showParameter("netbios name");
@@ -21,4 +23,3 @@
showParameter("log level");
showParameter("server signing");
showParameter("interfaces");
-
More information about the samba-cvs
mailing list