diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 11:52:07 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 04:19:05 +0200 |
| commit | 47ece3f897305970999fbcf012229105838c3687 (patch) | |
| tree | 5d3d1c0f5ac2a7a0a7b55850b790bfca130b59b1 | |
| parent | a0758bb5e5035a2547808a1fc89fe4fef51ed90c (diff) | |
| download | samba-47ece3f897305970999fbcf012229105838c3687.tar.gz samba-47ece3f897305970999fbcf012229105838c3687.tar.bz2 samba-47ece3f897305970999fbcf012229105838c3687.zip | |
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
| -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 2fe6b2d5e3..e7a172c93a 100644 --- 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 3ecae2e184..a4a55188bf 100644 --- 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) |