summaryrefslogtreecommitdiff
path: root/lib/param
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-18 15:19:15 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-19 08:02:32 +0200
commitcf9bd1d9ed6db5d35d92816382edbadc217de792 (patch)
tree9643306455b8788b6de6cdd94e682b98a91b3c73 /lib/param
parent8822b3b6628e82ce85cb20d2bbbe2d0664b9aa8f (diff)
downloadsamba-cf9bd1d9ed6db5d35d92816382edbadc217de792.tar.gz
samba-cf9bd1d9ed6db5d35d92816382edbadc217de792.tar.bz2
samba-cf9bd1d9ed6db5d35d92816382edbadc217de792.zip
s3-param: Make lp_name_resolve_order() return a list
This allows this parameter, one of the few with differing declarations between the loadparm systems, to be brought into common. Andrew Bartlett Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'lib/param')
-rw-r--r--lib/param/loadparm.c1
-rw-r--r--lib/param/param_functions.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index f6156bd0e0..d5f370e80f 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1526,7 +1526,6 @@ static struct loadparm_context *global_loadparm_context;
FN_GLOBAL_BOOL(readraw, bReadRaw)
FN_GLOBAL_BOOL(unicode, bUnicode)
FN_GLOBAL_BOOL(writeraw, bWriteRaw)
-FN_GLOBAL_LIST(name_resolve_order, szNameResolveOrder)
FN_GLOBAL_LIST(smb_ports, smb_ports)
FN_GLOBAL_STRING(cachedir, szCacheDir)
FN_GLOBAL_STRING(socket_address, szSocketAddress)
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 914150a337..c2bd63105a 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -349,6 +349,7 @@ FN_GLOBAL_LIST(dns_update_command, szDNSUpdateCommand)
FN_GLOBAL_LIST(eventlog_list, szEventLogs)
FN_GLOBAL_LIST(init_logon_delayed_hosts, szInitLogonDelayedHosts)
FN_GLOBAL_LIST(interfaces, szInterfaces)
+FN_GLOBAL_LIST(name_resolve_order, szNameResolveOrder)
FN_GLOBAL_LIST(netbios_aliases, szNetbiosAliases)
FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand)
FN_GLOBAL_LIST(preload_modules, szPreloadModules)