From f52b97a1292e4e84fccd4601d341de857cc5e586 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 1 Jun 2011 11:13:30 +1000 Subject: s3-param Make charset parameters const This removes the dangerous ability for these parameters to change based on % substitutions. Andrew Bartlett --- source3/param/loadparm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/param') diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 02b08a60a2..a8e5f19c40 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5565,9 +5565,9 @@ static char *lp_string(const char *s) char fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);} FN_GLOBAL_STRING(lp_smb_ports, &Globals.smb_ports) -FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset) -FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset) -FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset) +FN_GLOBAL_CONST_STRING(lp_dos_charset, &Globals.dos_charset) +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) -- cgit