s3-param Make lp_smb_ports() const

It makes no sense to have a % substiution in the 'smb ports' parameter.

Andrew Bartlett

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3f5417a4717319ed19c13ae568e13528bc644c89..0d70c4fc78e43709b95847b39fa755c029df7ec4 100644 (file)
--- 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 a8e5f19c40bc22171202e97307c81687ab9fd323..6ae866399bb851adfd7115d857262f4ee17c16de 100644 (file)
--- 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)