summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pool <mbp@samba.org>2001-11-19 03:52:09 +0000
committerMartin Pool <mbp@samba.org>2001-11-19 03:52:09 +0000
commit9ba9fcd6dd56e48847bd91bb1fbb34089a684890 (patch)
treec73ca2632763c59d20c9199d36e8eb90431a0187
parentd173bf704904329797fa32d29607e8ebd639f5cd (diff)
downloadsamba-9ba9fcd6dd56e48847bd91bb1fbb34089a684890.tar.gz
samba-9ba9fcd6dd56e48847bd91bb1fbb34089a684890.tar.bz2
samba-9ba9fcd6dd56e48847bd91bb1fbb34089a684890.zip
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)
-rw-r--r--source3/dynconfig.c2
-rw-r--r--source3/include/dynconfig.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/dynconfig.c b/source3/dynconfig.c
index a12eee1506..34603fee86 100644
--- 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 3aba194ab2..b6a186f91b 100644
--- 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;