s3-param Make lp_lockdir() const

This disables % substitutions in the 'lock dir' parameter.  This is
used all over the codebase, and needs to be internally consistent
for the life of the process, as they determine the location of
our locking databases.

Andrew Bartlett

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 93ba2beaa75b3ca39583931592e89ba53cc435aa..363d5e761abd0c1903c46abfd576c3c831d4b084 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1190,7 +1190,7 @@ char *lp_enumports_cmd(void);
 char *lp_addprinter_cmd(void);
 char *lp_deleteprinter_cmd(void);
 char *lp_os2_driver_map(void);
-char *lp_lockdir(void);
+const char *lp_lockdir(void);
 char *lp_statedir(void);
 char *lp_cachedir(void);
 char *lp_piddir(void);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 153db7f06b65e44def0b9a3ec127ba2c499c5e72..808d4f714c86fc733a094a89411423bdd74aeaae 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5579,7 +5579,7 @@ FN_GLOBAL_STRING(lp_enumports_cmd, &Globals.szEnumPortsCommand)
 FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
 FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
 FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
-FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
+FN_GLOBAL_CONST_STRING(lp_lockdir, &Globals.szLockDir)
 /* If lp_statedir() and lp_cachedir() are explicitely set during the
  * build process or in smb.conf, we use that value.  Otherwise they
  * default to the value of lp_lockdir(). */