summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-12-24 16:04:23 +1300
committerJeremy Allison <jra@samba.org>2014-01-24 16:19:00 -0800
commitbe9821b33df0b873f92d60a3e27f9cf9e298646c (patch)
treefea22d2d290c026c95e4810b59933966291ed408
parentf6c5c386d594bcb96e541fe0e5e1bc8885dc1ae5 (diff)
downloadsamba-be9821b33df0b873f92d60a3e27f9cf9e298646c.tar.gz
samba-be9821b33df0b873f92d60a3e27f9cf9e298646c.tar.xz
samba-be9821b33df0b873f92d60a3e27f9cf9e298646c.zip
param: Rename variable used for lp_name_resolve_order szNameResolveOrder
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/param/loadparm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 24a6e88c1e..66399dabcf 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -353,7 +353,7 @@ FN_GLOBAL_LIST(dns_update_command, dns_update_command)
FN_GLOBAL_LIST(eventlog_list, eventlog_list)
FN_GLOBAL_LIST(init_logon_delayed_hosts, szinit_logon_delayedHosts)
FN_GLOBAL_LIST(interfaces, interfaces)
-FN_GLOBAL_LIST(name_resolve_order, szNameResolveOrder)
+FN_GLOBAL_LIST(name_resolve_order, name_resolve_order)
FN_GLOBAL_LIST(netbios_aliases, szNetbiosAliases)
FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand)
FN_GLOBAL_LIST(preload_modules, szPreloadModules)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 2457eba2ce..692bdc6c37 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1537,7 +1537,7 @@ static struct parm_struct parm_table[] = {
.label = "name resolve order",
.type = P_LIST,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szNameResolveOrder),
+ .offset = GLOBAL_VAR(name_resolve_order),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_WIZARD,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2001454e12..0f1649c344 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -800,7 +800,7 @@ static void init_globals(bool reinit_globals)
string_set(&Globals.logon_home, "\\\\%N\\%U");
string_set(&Globals.logon_path, "\\\\%N\\%U\\profile");
- Globals.szNameResolveOrder = (const char **)str_list_make_v3(NULL, "lmhosts wins host bcast", NULL);
+ Globals.name_resolve_order = (const char **)str_list_make_v3(NULL, "lmhosts wins host bcast", NULL);
string_set(&Globals.passwordserver, "*");
Globals.algorithmic_rid_base = BASE_RID;