diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-11 00:13:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:32 -0500 |
| commit | b2f132182174d13c8bcb535f62522687675947c2 (patch) | |
| tree | b0335851e35e04910dfb40fe2b486a97374c1a8a /source4/param | |
| parent | b2f84fef133fb4c59e78fd0cf861f553efcbc1ef (diff) | |
| download | samba-b2f132182174d13c8bcb535f62522687675947c2.tar.gz samba-b2f132182174d13c8bcb535f62522687675947c2.tar.bz2 samba-b2f132182174d13c8bcb535f62522687675947c2.zip | |
r8297: add libinclude() function in ejs, which is like include() but searches a js library
path set in "js include" in smb.conf.
This will allow us to start building up a library of common js code,
while avoiding the problem of hard-coding include paths in scripts
(This used to be commit ff60529ba2515df29a20b4a417327a3565ec8ee9)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 6 |
1 files changed, 6 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) |