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/include | |
| 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/include')
| -rw-r--r-- | source3/include/dynconfig.h | 17 | ||||
| -rw-r--r-- | source3/include/proto.h | 3 |
2 files changed, 11 insertions, 9 deletions
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); |