summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/param/loadparm.c2
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c11
3 files changed, 12 insertions, 3 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 2dcf06c910..80733b4e29 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2128,7 +2128,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "cache directory", dyn_CACHEDIR);
lpcfg_do_global_parameter(lp_ctx, "ncalrpc dir", dyn_NCALRPCDIR);
- lpcfg_do_global_parameter(lp_ctx, "socket address", "");
+ lpcfg_do_global_parameter(lp_ctx, "nbt client socket address", "");
lpcfg_do_global_parameter_var(lp_ctx, "server string",
"Samba %s", SAMBA_VERSION_STRING);
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 36e89f38f2..4ff44f02a0 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -249,6 +249,7 @@ FN_GLOBAL_CONST_STRING(logon_drive, szLogonDrive)
FN_GLOBAL_CONST_STRING(logon_home, szLogonHome)
FN_GLOBAL_CONST_STRING(logon_path, szLogonPath)
FN_GLOBAL_CONST_STRING(logon_script, szLogonScript)
+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_scope, szNetbiosScope)
@@ -259,7 +260,6 @@ FN_GLOBAL_CONST_STRING(piddir, szPidDir)
FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir)
FN_GLOBAL_CONST_STRING(realm, szRealm_upper)
FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile)
-FN_GLOBAL_CONST_STRING(socket_address, szSocketAddress)
FN_GLOBAL_CONST_STRING(socket_options, socket_options)
FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir)
FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 7cbc15cb0b..a793695083 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3477,10 +3477,19 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
+ .label = "nbt client socket address",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(nbt_client_socket_address),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_DEPRECATED,
+ },
+ {
.label = "socket address",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szSocketAddress),
+ .offset = GLOBAL_VAR(nbt_client_socket_address),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_DEPRECATED,