diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-12 05:57:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:20:09 -0500 |
| commit | b3320581ff2e1e3b73d61bbe1e5e78ca630855e1 (patch) | |
| tree | 2b5cd0048f6c92dae510953d07e54054f1a44a71 | |
| parent | f0cbb1787eec4f912ce60cfcd0172cb6e32ec118 (diff) | |
| download | samba-b3320581ff2e1e3b73d61bbe1e5e78ca630855e1.tar.gz samba-b3320581ff2e1e3b73d61bbe1e5e78ca630855e1.tar.bz2 samba-b3320581ff2e1e3b73d61bbe1e5e78ca630855e1.zip | |
r8344: added a "setup directory" smb.conf parameter, pointing at the setup template files
(This used to be commit c842144cbf642b10df21c979d3c4b9fe94384b96)
| -rw-r--r-- | source4/param/loadparm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index d6184fd9ae..0b1eb2dcd6 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -125,6 +125,7 @@ typedef struct char *szLockDir; char *szPidDir; char *szRootdir; + char *szSetupDir; char *szDefaultService; char *szHostsEquiv; char *szServerString; @@ -736,6 +737,7 @@ static struct parm_struct parm_table[] = { {"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}, + {"setup directory", P_STRING, P_GLOBAL, &Globals.szSetupDir, 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}, @@ -1065,6 +1067,7 @@ static void init_globals(void) do_parameter("tls certfile", "tls/cert.pem"); do_parameter("tls cafile", "tls/ca.pem"); do_parameter_var("js include", "%s/js", dyn_LIBDIR); + do_parameter_var("setup directory", "%s/setup", dyn_LIBDIR); } static TALLOC_CTX *lp_talloc; @@ -1184,6 +1187,7 @@ FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir) FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString) FN_GLOBAL_STRING(lp_printcapname, &Globals.szPrintcapname) FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir) +FN_GLOBAL_STRING(lp_setupdir, &Globals.szSetupDir) FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir) FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir) FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, &Globals.dcerpc_ep_servers) |