From a74e7fbc6abb16e85eb6ac14193be0e0f664a6f0 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 1 Jun 2011 11:18:09 +1000 Subject: s3-param Make lp_smb_ports() const It makes no sense to have a % substiution in the 'smb ports' parameter. Andrew Bartlett --- source3/include/proto.h | 2 +- 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 3f5417a471..0d70c4fc78 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1175,7 +1175,7 @@ NTSTATUS change_trust_account_password( const char *domain, const char *remote_m /* The following definitions come from param/loadparm.c */ -char *lp_smb_ports(void); +const char *lp_smb_ports(void); const char *lp_dos_charset(void); const char *lp_unix_charset(void); const char *lp_display_charset(void); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index a8e5f19c40..6ae866399b 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5564,7 +5564,7 @@ static char *lp_string(const char *s) #define FN_LOCAL_CHAR(fn_name,val) \ 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_CONST_STRING(lp_smb_ports, &Globals.smb_ports) 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) -- cgit