summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-01 11:53:21 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-01 04:19:05 +0200
commit08a72f3a1571649eb52c7e06bab2789e0887c173 (patch)
tree9c43646a0fb0583c4aaa65b0663c031894125902
parent47ece3f897305970999fbcf012229105838c3687 (diff)
downloadsamba-08a72f3a1571649eb52c7e06bab2789e0887c173.tar.gz
samba-08a72f3a1571649eb52c7e06bab2789e0887c173.tar.bz2
samba-08a72f3a1571649eb52c7e06bab2789e0887c173.zip
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
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/param/loadparm.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e7a172c93a..c51af0065c 100644
--- 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 a4a55188bf..f8b9e97ec2 100644
--- 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)