sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00
Code

r8640: continue the trend by moving the ejs random calls into an object

Browse Source 
(This used to be commit ed4fb68ef7c28e415408e923bd9eefcd2d60f355)
This commit is contained in:
Andrew Tridgell 2005-07-20 07:29:23 +00:00 committed by Gerald (Jerry) Carter
parent 86d628a292
commit d5ac1f9bf4
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/scripting/ejs/smbcalls_rand.c
View File

@ -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);
}

2
source4/scripting/libjs/provision.js
View File

@ -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);

3
swat/install/newuser.esp
View File

@ -9,6 +9,7 @@
<%
var f = FormObj("newuser", 3, 2);
var i;
var rand = random_init();
f.element[0].label = "User Name";
f.element[0].name = "USERNAME";
@ -29,7 +30,7 @@ if (form['submit'] == "Add" &&
form.UNIXNAME = form.USERNAME;
}
if (form.PASSWORD == undefined) {
form.PASSWORD = randpass();
form.PASSWORD = rand.randpass();
}
newuser(form.USERNAME, form.UNIXNAME, form.PASSWORD, writefln);
} else {