dyn_LOCKDIR should be const because it's never modified directly --

it's just copied in to the parameter table and optionally overridden
there.
(This used to be commit 988fe772a39e08dec738b045021cd6e06b4e59c8)

diff --git a/source3/dynconfig.c b/source3/dynconfig.c
index a12eee1506ab85cd03e6e6a1d62ae5d5a5a85ba3..34603fee86b9902a28cced0045a265565f016245 100644 (file)
--- a/source3/dynconfig.c
+++ b/source3/dynconfig.c
@@ -61,4 +61,4 @@ pstring dyn_LIBDIR;
  *
  * Not writable, but used to set a default in the parameter table.
  **/
-pstring dyn_LOCKDIR;
+const pstring dyn_LOCKDIR;

diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h
index 3aba194ab230821de3a4b76ab3852b5056a2016a..b6a186f91beb30c0e45ff2dbe5791db53fd39157 100644 (file)
--- a/source3/include/dynconfig.h
+++ b/source3/include/dynconfig.h
@@ -29,4 +29,5 @@ extern char const *dyn_SBINDIR,
 
 extern pstring dyn_CONFIGFILE;
 extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
-extern pstring dyn_LIBDIR, dyn_LOCKDIR; 
+extern pstring dyn_LIBDIR;
+extern const pstring dyn_LOCKDIR;