From 47ece3f897305970999fbcf012229105838c3687 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 1 Jun 2011 11:52:07 +1000 Subject: s3-param Make lp_piddir() const This disables % substitutions in the 'pid dir' parameter. This is used all over the codebase, and need to be internally consistent between all the Samba tasks. Andrew Bartlett --- source3/include/proto.h | 2 +- source3/param/loadparm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/include/proto.h b/source3/include/proto.h index 2fe6b2d5e3..e7a172c93a 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1193,7 +1193,7 @@ char *lp_os2_driver_map(void); const char *lp_lockdir(void); const char *lp_statedir(void); const char *lp_cachedir(void); -char *lp_piddir(void); +const char *lp_piddir(void); char *lp_mangling_method(void); int lp_mangle_prefix(void); char *lp_utmpdir(void); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3ecae2e184..a4a55188bf 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5601,7 +5601,7 @@ const char *lp_cachedir(void) { return(*(char **)(&Globals.szLockDir) ? *(char **)(&Globals.szLockDir) : ""); } -FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir) +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) -- cgit