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/dynconfig.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'source3/dynconfig.c') diff --git a/source3/dynconfig.c b/source3/dynconfig.c index 6125f9944ca..dfec0c3baa8 100644 --- a/source3/dynconfig.c +++ b/source3/dynconfig.c @@ -76,30 +76,9 @@ DEFINE_DYN_CONFIG_PARAM(LIBDIR) DEFINE_DYN_CONFIG_PARAM(MODULESDIR) DEFINE_DYN_CONFIG_PARAM(SHLIBEXT) DEFINE_DYN_CONFIG_PARAM(LOCKDIR) +DEFINE_DYN_CONFIG_PARAM(STATEDIR) /** Persistent state files. Default LOCKDIR */ +DEFINE_DYN_CONFIG_PARAM(CACHEDIR) /** Temporary cache files. Default LOCKDIR */ DEFINE_DYN_CONFIG_PARAM(PIDDIR) DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR) DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE) DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR) - -/* In non-FHS mode, these should be configurable using 'lock dir ='; - but in FHS mode, they are their own directory. Implement as wrapper - functions so that everything can still be kept in dynconfig.c. - */ - -const char *get_dyn_STATEDIR(void) -{ -#ifdef FHS_COMPATIBLE - return STATEDIR; -#else - return lp_lockdir(); -#endif -} - -const char *get_dyn_CACHEDIR(void) -{ -#ifdef FHS_COMPATIBLE - return CACHEDIR; -#else - return lp_lockdir(); -#endif -} -- cgit