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

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2fe6b2d5e33bc3c2d886064e4bcc4613c402f32a..e7a172c93a7e2ad3f2d495b20681cfacfffda1b4 100644 (file)
--- 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 3ecae2e184f694ac6edb0a34df2f796cc122adf3..a4a55188bf13761beed9146e6adc1417e5294eba 100644 (file)
--- 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)