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/utils/testparm.c | |
| 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/utils/testparm.c')
| -rw-r--r-- | source3/utils/testparm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 57f619e456..50518c2f12 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -98,24 +98,24 @@ static int do_global_checks(void) lp_lock_directory()); } - if (!directory_exist_stat(lp_statedir(), &st)) { + if (!directory_exist_stat(lp_state_directory(), &st)) { fprintf(stderr, "ERROR: state directory %s does not exist\n\n", - lp_statedir()); + lp_state_directory()); ret = 1; } else if ((st.st_ex_mode & 0777) != 0755) { fprintf(stderr, "WARNING: state directory %s should have " "permissions 0755 for browsing to work\n\n", - lp_statedir()); + lp_state_directory()); } - if (!directory_exist_stat(lp_cachedir(), &st)) { + if (!directory_exist_stat(lp_cache_directory(), &st)) { fprintf(stderr, "ERROR: cache directory %s does not exist\n\n", - lp_cachedir()); + lp_cache_directory()); ret = 1; } else if ((st.st_ex_mode & 0777) != 0755) { fprintf(stderr, "WARNING: cache directory %s should have " "permissions 0755 for browsing to work\n\n", - lp_cachedir()); + lp_cache_directory()); } if (!directory_exist_stat(lp_pid_directory(), &st)) { |