diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-01-15 15:59:54 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-12 13:17:13 +1300 |
| commit | 4ea7318e562f21eaf913555b5e85dc556305346f (patch) | |
| tree | 2a3d0785154d3d70ef2e5cfde02630117a1750c3 /source3/lib | |
| parent | 86850860f871700da02000f5b7af374563134344 (diff) | |
| download | samba-4ea7318e562f21eaf913555b5e85dc556305346f.tar.gz samba-4ea7318e562f21eaf913555b5e85dc556305346f.tar.xz samba-4ea7318e562f21eaf913555b5e85dc556305346f.zip | |
lib/param: Remove special handling for 'state dir' and 'cache dir'
The build system gives these two parameters different defaults
(compared with lock dir) in both the --enable-fhs and default mode, so
the logic to use lock dir no longer applies unless the build has been
very specially constructed.
Therefore, remove the special case handling and make these normal
parameters again.
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 342db91c9b8..cddb53c3cb9 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1530,7 +1530,7 @@ char *lock_path(const char *name) char *state_path(const char *name) { - return xx_path(name, lp_statedir()); + return xx_path(name, lp_state_directory()); } /** @@ -1543,7 +1543,7 @@ char *state_path(const char *name) char *cache_path(const char *name) { - return xx_path(name, lp_cachedir()); + return xx_path(name, lp_cache_directory()); } /******************************************************************* |