lib/param: Remove special handling for 'state dir' and 'cache dir'

Enterprise / Samba - Andrew Bartlett [samba.org] - 11 February 2014 18:17 UTC

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.

4ea7318 lib/param: Remove special handling for 'state dir' and 'cache dir'
docs-xml/smbdotconf/misc/cachedirectory.xml | 2 +-
docs-xml/smbdotconf/misc/statedirectory.xml | 2 +-
lib/param/loadparm.c | 4 ----
lib/param/param_table.c | 4 ++--
lib/param/util.c | 4 ++--
source3/include/proto.h | 2 --
source3/lib/util.c | 4 ++--
source3/param/loadparm.c | 28 ++-------------------------
source3/utils/testparm.c | 12 ++++++------
9 files changed, 16 insertions(+), 46 deletions(-)

Upstream: gitweb.samba.org


  • Share