diff options
| -rw-r--r-- | source4/param/loadparm.c | 6 | ||||
| -rw-r--r-- | source4/scripting/ejs/smbcalls.c | 47 |
2 files changed, 53 insertions, 0 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 49dbd74a69..d6184fd9ae 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -138,6 +138,7 @@ typedef struct char *szSPOOLSS_URL; char *szWINS_URL; char *szPrivateDir; + char **jsInclude; char **szPreloadModules; char **szPasswordServers; char *szSocketOptions; @@ -734,6 +735,7 @@ static struct parm_struct parm_table[] = { {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"js include", P_LIST, P_GLOBAL, &Globals.jsInclude, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"default service", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"default", P_STRING, P_GLOBAL, &Globals.szDefaultService, NULL, NULL, FLAG_DEVELOPER}, @@ -1062,6 +1064,7 @@ static void init_globals(void) do_parameter("tls keyfile", "tls/key.pem"); do_parameter("tls certfile", "tls/cert.pem"); do_parameter("tls cafile", "tls/ca.pem"); + do_parameter_var("js include", "%s/js", dyn_LIBDIR); } static TALLOC_CTX *lp_talloc; @@ -1284,6 +1287,9 @@ FN_GLOBAL_INTEGER(lp_lm_interval, &Globals.lm_interval) FN_GLOBAL_INTEGER(lp_machine_password_timeout, &Globals.machine_password_timeout) FN_GLOBAL_INTEGER(lp_lock_spin_count, &Globals.iLockSpinCount) FN_GLOBAL_INTEGER(lp_lock_sleep_time, &Globals.iLockSpinTime) +FN_GLOBAL_LIST(lp_js_include, &Globals.jsInclude) + + FN_LOCAL_STRING(lp_servicename, szService) FN_LOCAL_CONST_STRING(lp_const_servicename, szService) FN_LOCAL_STRING(lp_pathname, szPath) diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c index ff57eff129..1abbb52819 100644 --- a/source4/scripting/ejs/smbcalls.c +++ b/source4/scripting/ejs/smbcalls.c @@ -66,6 +66,52 @@ static int ejs_typeof(MprVarHandle eid, int argc, struct MprVar **argv) /* + libinclude() allows you to include js files using a search path specified + in "js include =" in smb.conf. +*/ +static int ejs_libinclude(int eid, int argc, char **argv) +{ + int i, j; + const char **js_include = lp_js_include(); + + if (js_include == NULL || js_include[0] == NULL) { + return -1; + } + + for (i = 0; i < argc; i++) { + const char *script = argv[i]; + + for (j=0;js_include[j];j++) { + char *path; + path = talloc_asprintf(mprMemCtx(), "%s/%s", js_include[j], script); + if (path == NULL) { + return -1; + } + if (file_exist(path)) { + int ret; + struct MprVar result; + char *emsg; + + ret = ejsEvalFile(eid, path, &result, &emsg); + talloc_free(path); + if (ret < 0) { + ejsSetErrorMsg(eid, "%s: %s", script, emsg); + return -1; + } + break; + } + talloc_free(path); + } + if (js_include[j] == NULL) { + ejsSetErrorMsg(eid, "unable to include '%s'", script); + return -1; + } + } + return 0; +} + + +/* setup C functions that be called from ejs */ void smb_setup_ejs_functions(void) @@ -78,6 +124,7 @@ void smb_setup_ejs_functions(void) smb_setup_ejs_auth(); ejsDefineCFunction(-1, "typeof", ejs_typeof, NULL, MPR_VAR_SCRIPT_HANDLE); + ejsDefineStringCFunction(-1, "libinclude", ejs_libinclude, NULL, MPR_VAR_SCRIPT_HANDLE); } /* |