r8337: - use 64 bit access functions in ejs calls

- added access to smbd random functions

- fixed ordering in join()

- added sys_interfaces(), sys_hostname(), sys_nttime() and sys_ldaptime()
(This used to be commit 28c1a1f3c0cd2f8228fd8c3c695ab6f45226fa3f)

1 files changed, 2 insertions, 16 deletions

diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index 2da1e8c669..e58151620f 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -65,21 +65,6 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv)
 }
 
 /*
-  return the list of configured network interfaces
-*/
-static int ejs_IfaceList(MprVarHandle eid, int argc, struct MprVar **argv)
-{
-	int i, count = iface_count();
-	struct MprVar ret = mprObject("interfaces");
-	for (i=0;i<count;i++) {
-		mprAddArray(&ret, i, mprString(iface_n_ip(i)));
-	}
-	mpr_Return(eid, ret);
-	return 0;	
-}
-
-
-/*
   libinclude() allows you to include js files using a search path specified
   in "js include =" in smb.conf. 
 */
@@ -139,9 +124,10 @@ void smb_setup_ejs_functions(void)
 	smb_setup_ejs_options();
 	smb_setup_ejs_nss();
 	smb_setup_ejs_string();
+	smb_setup_ejs_random();
+	smb_setup_ejs_system();
 
 	ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE);
-	ejsDefineCFunction(-1, "IfaceList", ejs_IfaceList, NULL, MPR_VAR_SCRIPT_HANDLE);
 	ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE);
 }