s4:param Add "state dir" and "cache dir" to Samba4's smb.conf parser

These will somehow be passed into the Samba3 code.

Andrew Bartlett

diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h
index 48f8ab628fecec6ed6109358bc0d96ca16989996..fb5b8dcc08d0a7e750cba6304cd8a1a38e37bbf8 100644 (file)
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -38,6 +38,8 @@ extern const char *dyn_PRIVATE_DIR;
 extern const char *dyn_SWATDIR;
 extern const char *dyn_JSDIR;
 extern const char *dyn_SETUPDIR;
+extern const char *dyn_STATEDIR;
+extern const char *dyn_CACHEDIR;
 extern const char *dyn_WINBINDD_SOCKET_DIR;
 extern const char *dyn_WINBINDD_PRIVILEGED_SOCKET_DIR;
 extern const char *dyn_NTP_SIGND_SOCKET_DIR;

diff --git a/source4/librpc/gen_ndr/README b/source4/librpc/gen_ndr/README
deleted file mode 100644 (file)
index 0c1fd16..0000000
--- a/source4/librpc/gen_ndr/README
+++ /dev/null
@@ -1 +0,0 @@
-This contains the generated files from PIDL for the IDL files in ../idl/*.idl

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 8c0f7d4d24312ae87425caa8c1b3f868b4146f15..5df5831935fd823b44120bfd29dda04a2174a906 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -91,6 +91,8 @@ struct loadparm_global
        char *szModulesDir;
        char *szPidDir;
        char *szSetupDir;
+       char *szCacheDir;
+       char *szStateDir;
        char *szServerString;
        char *szAutoServices;
        char *szPasswdChat;
@@ -483,6 +485,8 @@ static struct parm_struct parm_table[] = {
        {"modules dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szModulesDir), NULL, NULL},
        {"pid directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szPidDir), NULL, NULL}, 
        {"setup directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szSetupDir), NULL, NULL},
+       {"state dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szStateDir), NULL, NULL}, 
+       {"cache dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szCacheDir), NULL, NULL}, 
 
        {"socket address", P_STRING, P_GLOBAL, GLOBAL_VAR(szSocketAddress), NULL, NULL},
        {"copy", P_STRING, P_LOCAL, LOCAL_VAR(szCopy), handle_copy, NULL},
@@ -655,6 +659,8 @@ _PUBLIC_ FN_GLOBAL_STRING(lp_lockdir, szLockDir)
 _PUBLIC_ FN_GLOBAL_STRING(lp_modulesdir, szModulesDir)
 _PUBLIC_ FN_GLOBAL_STRING(lp_setupdir, szSetupDir)
 _PUBLIC_ FN_GLOBAL_STRING(lp_ncalrpc_dir, ncalrpc_dir)
+_PUBLIC_ FN_GLOBAL_STRING(lp_state_dir, szStateDir)
+_PUBLIC_ FN_GLOBAL_STRING(lp_cache_dir, szCacheDir)
 _PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, dos_charset)
 _PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, unix_charset)
 _PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, display_charset)
@@ -2376,6 +2382,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lp_do_global_parameter(lp_ctx, "lock dir", dyn_LOCKDIR);
        lp_do_global_parameter(lp_ctx, "modules dir", dyn_MODULESDIR);
        lp_do_global_parameter(lp_ctx, "ncalrpc dir", dyn_NCALRPCDIR);
+       lp_do_global_parameter(lp_ctx, "state dir", dyn_STATEDIR);
+       lp_do_global_parameter(lp_ctx, "cache dir", dyn_CACHEDIR);
 
        lp_do_global_parameter(lp_ctx, "socket address", "0.0.0.0");
        lp_do_global_parameter_var(lp_ctx, "server string",