s3-param Make lp_utmpdir() and lp_wtmpdir const

This disables % substitutions in the 'utmp dir' and 'wtmp dir'
parameters.  These are system paths, and need to be consistent between
all the Samba tasks.

Andrew Bartlett

diff --git a/source3/include/proto.h b/source3/include/proto.h
index e7a172c93a7e2ad3f2d495b20681cfacfffda1b4..c51af0065c6a31720d5170a14721bf2eb437b7ab 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1196,8 +1196,8 @@ const char *lp_cachedir(void);
 const char *lp_piddir(void);
 char *lp_mangling_method(void);
 int lp_mangle_prefix(void);
-char *lp_utmpdir(void);
-char *lp_wtmpdir(void);
+const char *lp_utmpdir(void);
+const char *lp_wtmpdir(void);
 bool lp_utmp(void);
 char *lp_rootdir(void);
 char *lp_defaultservice(void);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a4a55188bf13761beed9146e6adc1417e5294eba..f8b9e97ec27dc9a490026b9165c15b5e654ad679 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5604,8 +5604,8 @@ const char *lp_cachedir(void) {
 FN_GLOBAL_CONST_STRING(lp_piddir, &Globals.szPidDir)
 FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
 FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
-FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
-FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
+FN_GLOBAL_CONST_STRING(lp_utmpdir, &Globals.szUtmpDir)
+FN_GLOBAL_CONST_STRING(lp_wtmpdir, &Globals.szWtmpDir)
 FN_GLOBAL_BOOL(lp_utmp, &Globals.bUtmp)
 FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir)
 FN_GLOBAL_STRING(lp_perfcount_module, &Globals.szSMBPerfcountModule)