diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 11:19:21 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 04:19:05 +0200 |
| commit | f331936db2990589047edd4aee61ac298262123d (patch) | |
| tree | 59a0c6757e5f3d499d83ad55035afb0e962d81d2 | |
| parent | a74e7fbc6abb16e85eb6ac14193be0e0f664a6f0 (diff) | |
| download | samba-f331936db2990589047edd4aee61ac298262123d.tar.gz samba-f331936db2990589047edd4aee61ac298262123d.tar.bz2 samba-f331936db2990589047edd4aee61ac298262123d.zip | |
s3-param Make lp_smb_passwd_file() and lp_private_dir() const
This disables % substitutions in the 'smb passwd file' and 'private
dir' parameters. These are used all over the codebase, and need to be
internally consistent for the life of the process, as they determine
the location of secrets.tdb, as well as the passdb databases.
Andrew Bartlett
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 0d70c4fc78..93ba2beaa7 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1181,8 +1181,8 @@ const char *lp_unix_charset(void); const char *lp_display_charset(void); char *lp_logfile(void); char *lp_configfile(void); -char *lp_smb_passwd_file(void); -char *lp_private_dir(void); +const char *lp_smb_passwd_file(void); +const char *lp_private_dir(void); char *lp_serverstring(void); int lp_printcap_cache_time(void); char *lp_addport_cmd(void); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 6ae866399b..153db7f06b 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5570,8 +5570,8 @@ FN_GLOBAL_CONST_STRING(lp_unix_charset, &Globals.unix_charset) FN_GLOBAL_CONST_STRING(lp_display_charset, &Globals.display_charset) FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile) FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile) -FN_GLOBAL_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile) -FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir) +FN_GLOBAL_CONST_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile) +FN_GLOBAL_CONST_STRING(lp_private_dir, &Globals.szPrivateDir) FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString) FN_GLOBAL_INTEGER(lp_printcap_cache_time, &Globals.PrintcapCacheTime) FN_GLOBAL_STRING(lp_addport_cmd, &Globals.szAddPortCommand) |