summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-18 11:51:00 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-19 08:02:32 +0200
commit0f57da57e3c250c0b00d1a369eeff0eb49bee4f8 (patch)
tree5145843382cc36b994ac8986fd425bee2c05be5a /source3/param
parentcf9bd1d9ed6db5d35d92816382edbadc217de792 (diff)
downloadsamba-0f57da57e3c250c0b00d1a369eeff0eb49bee4f8.tar.gz
samba-0f57da57e3c250c0b00d1a369eeff0eb49bee4f8.tar.bz2
samba-0f57da57e3c250c0b00d1a369eeff0eb49bee4f8.zip
lib/param: bring lp_smb_ports() into common by making it a list everywhere
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4c21d5032f..00edc3f3d7 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1533,7 +1533,7 @@ static struct parm_struct parm_table[] = {
},
{
.label = "smb ports",
- .type = P_STRING,
+ .type = P_LIST,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(smb_ports),
.special = NULL,
@@ -4925,7 +4925,7 @@ static void init_globals(bool reinit_globals)
Globals.server_signing = SMB_SIGNING_DEFAULT;
Globals.bDeferSharingViolations = true;
- string_set(&Globals.smb_ports, SMB_PORTS);
+ Globals.smb_ports = (const char **)str_list_make_v3(NULL, SMB_PORTS, NULL);
Globals.bEnablePrivileges = true;
Globals.bHostMSDfs = true;
@@ -5109,7 +5109,6 @@ int lp_cups_encrypt(void)
/* These functions remain in source3/param for now */
-FN_GLOBAL_CONST_STRING(smb_ports, smb_ports)
FN_GLOBAL_INTEGER(security, security)
FN_GLOBAL_INTEGER(usershare_max_shares, iUsershareMaxShares)
FN_GLOBAL_STRING(configfile, szConfigFile)