From 19a05bf2f485023b11b41dfae3f6459847d55ef7 Mon Sep 17 00:00:00 2001 From: Steven Danneman Date: Thu, 8 Jan 2009 11:18:13 -0800 Subject: Make STATEDIR and CACHEDIR configurable through ./configure and loadparm.c If they are not explicitely set in either place both will default to LOCKDIR. Signed-off-by: Michael Adam --- source3/include/dynconfig.h | 17 ++++++++--------- source3/include/proto.h | 3 +++ 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'source3/include') diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h index 8267064f23..86c77138e7 100644 --- a/source3/include/dynconfig.h +++ b/source3/include/dynconfig.h @@ -67,6 +67,14 @@ const char *get_dyn_LOCKDIR(void); const char *set_dyn_LOCKDIR(const char *newpath); bool is_default_dyn_LOCKDIR(void); +const char *get_dyn_STATEDIR(void); +const char *set_dyn_STATEDIR(const char *newpath); +bool is_default_dyn_STATEDIR(void); + +const char *get_dyn_CACHEDIR(void); +const char *set_dyn_CACHEDIR(const char *newpath); +bool is_default_dyn_CACHEDIR(void); + const char *get_dyn_PIDDIR(void); const char *set_dyn_PIDDIR(const char *newpath); bool is_default_dyn_PIDDIR(void); @@ -82,12 +90,3 @@ bool is_default_dyn_SMB_PASSWD_FILE(void); const char *get_dyn_PRIVATE_DIR(void); const char *set_dyn_PRIVATE_DIR(const char *newpath); bool is_default_dyn_PRIVATE_DIR(void); - -/* - * For STATEDIR and CACHEDIR, there are only getter functions. - * In non-FHS-mode, these are configurable via LOCKDIR. - * In FHS-mode, these are their own fixed directories. - */ -const char *get_dyn_STATEDIR(void); - -const char *get_dyn_CACHEDIR(void); diff --git a/source3/include/proto.h b/source3/include/proto.h index 9a0ba9a401..9d990207a0 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1190,6 +1190,7 @@ char *lib_path(const char *name); char *modules_path(const char *name); char *data_path(const char *name); char *state_path(const char *name); +char *cache_path(const char *name); const char *shlib_ext(void); bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir, char **parent, const char **name); @@ -3872,6 +3873,8 @@ char *lp_addprinter_cmd(void); char *lp_deleteprinter_cmd(void); char *lp_os2_driver_map(void); char *lp_lockdir(void); +char *lp_statedir(void); +char *lp_cachedir(void); char *lp_piddir(void); char *lp_mangling_method(void); int lp_mangle_prefix(void); -- cgit