From d5ac1f9bf4062139054fa2b4677f6bde952bec13 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 20 Jul 2005 07:29:23 +0000 Subject: r8640: continue the trend by moving the ejs random calls into an object (This used to be commit ed4fb68ef7c28e415408e923bd9eefcd2d60f355) --- source4/scripting/ejs/smbcalls_rand.c | 19 +++++++++++++++---- source4/scripting/libjs/provision.js | 2 ++ 2 files changed, 17 insertions(+), 4 deletions(-) (limited to 'source4/scripting') diff --git a/source4/scripting/ejs/smbcalls_rand.c b/source4/scripting/ejs/smbcalls_rand.c index 81473ad737..043b9cca09 100644 --- a/source4/scripting/ejs/smbcalls_rand.c +++ b/source4/scripting/ejs/smbcalls_rand.c @@ -80,13 +80,24 @@ static int ejs_randsid(MprVarHandle eid, int argc, struct MprVar **argv) return 0; } +/* + initialise random ejs subsystem +*/ +static int ejs_random_init(MprVarHandle eid, int argc, struct MprVar **argv) +{ + struct MprVar *obj = mprInitObject(eid, "random", argc, argv); + + mprSetCFunction(obj, "random", ejs_random); + mprSetCFunction(obj, "randpass", ejs_randpass); + mprSetCFunction(obj, "randguid", ejs_randguid); + mprSetCFunction(obj, "randsid", ejs_randsid); + return 0; +} + /* setup C functions that be called from ejs */ void smb_setup_ejs_random(void) { - ejsDefineCFunction(-1, "random", ejs_random, NULL, MPR_VAR_SCRIPT_HANDLE); - ejsDefineCFunction(-1, "randpass", ejs_randpass, NULL, MPR_VAR_SCRIPT_HANDLE); - ejsDefineCFunction(-1, "randguid", ejs_randguid, NULL, MPR_VAR_SCRIPT_HANDLE); - ejsDefineCFunction(-1, "randsid", ejs_randsid, NULL, MPR_VAR_SCRIPT_HANDLE); + ejsDefineCFunction(-1, "random_init", ejs_random_init, NULL, MPR_VAR_SCRIPT_HANDLE); } diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index e9a8aad0cc..58f0e18240 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -224,6 +224,7 @@ function provision_guess() var subobj = new Object(); var nss = nss_init(); var lp = loadparm_init(); + random_init(local); subobj.REALM = lp.get("realm"); subobj.DOMAIN = lp.get("workgroup"); @@ -277,6 +278,7 @@ function newuser(username, unixname, password, message) var lp = loadparm_init(); var samdb = lp.get("sam database"); var ldb = ldb_init(); + random_init(local); /* connect to the sam */ var ok = ldb.connect(samdb); -- cgit