diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 11:45:44 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 04:19:05 +0200 |
| commit | 5f176378a802703778ae07c36e95fe186b6e57a8 (patch) | |
| tree | 2ee50650b58c71ef263fd4260afda5dd8578157a | |
| parent | f331936db2990589047edd4aee61ac298262123d (diff) | |
| download | samba-5f176378a802703778ae07c36e95fe186b6e57a8.tar.gz samba-5f176378a802703778ae07c36e95fe186b6e57a8.tar.bz2 samba-5f176378a802703778ae07c36e95fe186b6e57a8.zip | |
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
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 93ba2beaa7..363d5e761a 100644 --- 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 153db7f06b..808d4f714c 100644 --- 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(). */ |