diff options
| author | Steven Danneman <steven.danneman@isilon.com> | 2009-01-08 11:18:13 -0800 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2009-01-12 12:16:03 +0100 |
| commit | 19a05bf2f485023b11b41dfae3f6459847d55ef7 (patch) | |
| tree | 74b17e9f203dd81926a09876dc78e7cae3e799f6 /source3/dynconfig.c | |
| parent | ffb53c35748154081c1587b5f167721e32ff10f2 (diff) | |
| download | samba-19a05bf2f485023b11b41dfae3f6459847d55ef7.tar.gz samba-19a05bf2f485023b11b41dfae3f6459847d55ef7.tar.bz2 samba-19a05bf2f485023b11b41dfae3f6459847d55ef7.zip | |
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 <obnox@samba.org>
Diffstat (limited to 'source3/dynconfig.c')
| -rw-r--r-- | source3/dynconfig.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/source3/dynconfig.c b/source3/dynconfig.c index 6125f9944c..dfec0c3baa 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 -} |