From 0d6e3225fccd64107ec07d08591f44cc7b307746 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:04:23 +1300 Subject: [PATCH] param: Rename variable used for lp_netbios_aliases szNetbiosAliases Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 66399dabcfb..020d5d3b1ed 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -354,7 +354,7 @@ 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, name_resolve_order) -FN_GLOBAL_LIST(netbios_aliases, szNetbiosAliases) +FN_GLOBAL_LIST(netbios_aliases, netbios_aliases) FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand) FN_GLOBAL_LIST(preload_modules, szPreloadModules) FN_GLOBAL_LIST(rndc_command, szRNDCCommand) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 692bdc6c37d..97469987682 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -355,7 +355,7 @@ static struct parm_struct parm_table[] = { .label = "netbios aliases", .type = P_LIST, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szNetbiosAliases), + .offset = GLOBAL_VAR(netbios_aliases), .special = handle_netbios_aliases, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 0f1649c3449..30120abc505 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2763,9 +2763,9 @@ static bool handle_realm(struct loadparm_context *unused, int snum, const char * static bool handle_netbios_aliases(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr) { - TALLOC_FREE(Globals.szNetbiosAliases); - Globals.szNetbiosAliases = (const char **)str_list_make_v3(NULL, pszParmValue, NULL); - return set_netbios_aliases(Globals.szNetbiosAliases); + TALLOC_FREE(Globals.netbios_aliases); + Globals.netbios_aliases = (const char **)str_list_make_v3(NULL, pszParmValue, NULL); + return set_netbios_aliases(Globals.netbios_aliases); } /*************************************************************************** -- 2.11.4.GIT