diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:04:02 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:57 -0800 |
| commit | d06b706a2a43494b0539c4549373a7f1a6d8353e (patch) | |
| tree | be827a43a236fc06059e5463f9639891aa34d20a | |
| parent | 8e8745f0d3cdf127ade7cdfd8904aeec3bc197b9 (diff) | |
| download | samba-d06b706a2a43494b0539c4549373a7f1a6d8353e.tar.gz samba-d06b706a2a43494b0539c4549373a7f1a6d8353e.tar.xz samba-d06b706a2a43494b0539c4549373a7f1a6d8353e.zip | |
param: Rename variable used for lp_netbios_name szNetbiosName
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.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 444591194f..ba6e5d7bff 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -251,7 +251,7 @@ FN_GLOBAL_CONST_STRING(logon_path, logon_path) FN_GLOBAL_CONST_STRING(logon_script, logon_script) FN_GLOBAL_CONST_STRING(nbt_client_socket_address, nbt_client_socket_address) FN_GLOBAL_CONST_STRING(ncalrpc_dir, ncalrpc_dir) -FN_GLOBAL_CONST_STRING(netbios_name, szNetbiosName) +FN_GLOBAL_CONST_STRING(netbios_name, netbios_name) FN_GLOBAL_CONST_STRING(netbios_scope, szNetbiosScope) FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, szNTPSignDSocketDirectory) FN_GLOBAL_CONST_STRING(passdb_backend, passdb_backend) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 356fefe989..08753cf0c5 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -346,7 +346,7 @@ static struct parm_struct parm_table[] = { .label = "netbios name", .type = P_USTRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szNetbiosName), + .offset = GLOBAL_VAR(netbios_name), .special = NULL, .enum_list = NULL, .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 07bd7cb7b0..325bf9a2ba 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -748,7 +748,7 @@ static void init_globals(bool reinit_globals) DEBUG(3, ("Initialising global parameters\n")); /* Must manually force to upper case here, as this does not go via the handler */ - string_set(&Globals.szNetbiosName, myhostname_upper()); + string_set(&Globals.netbios_name, myhostname_upper()); string_set(&Globals.szSMBPasswdFile, get_dyn_SMB_PASSWD_FILE()); string_set(&Globals.szPrivateDir, get_dyn_PRIVATE_DIR()); |