summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml (renamed from docs-xml/smbdotconf/misc/socketaddress.xml)14
-rw-r--r--lib/param/loadparm.c2
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c11
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/libsmb/namequery.c4
-rw-r--r--source3/nmbd/nmbd.c2
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/utils/nmblookup.c2
9 files changed, 24 insertions, 17 deletions
diff --git a/docs-xml/smbdotconf/misc/socketaddress.xml b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
index 13ae11f395..f6784c3797 100644
--- a/docs-xml/smbdotconf/misc/socketaddress.xml
+++ b/docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
@@ -1,19 +1,17 @@
-<samba:parameter name="socket address"
+<samba:parameter name="nbt client socket address"
context="G"
type="string"
developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This option allows you to control what
- address Samba will listen for connections on. This is used to
- support multiple virtual interfaces on the one server, each
- with a different configuration.</para>
+ <para>This option allows you to control what address Samba
+ will send NBT client packets from, and process replies using,
+ including in nmbd. </para>
<para>Setting this option should never be necessary on usual Samba
servers running only one nmbd.</para>
- <para>By default Samba will accept connections on any
- address.</para>
- <para>This parameter is deprecated. See <smbconfoption name="bind interfaces only">Yes</smbconfoption> and <smbconfoption name="interfaces"></smbconfoption> .</para>
+ <para>By default Samba will send UDP packets from the OS default address for the destination, and accept replies on 0.0.0.0.</para>
+ <para>This parameter is deprecated. See <smbconfoption name="bind interfaces only">Yes</smbconfoption> and <smbconfoption name="interfaces"></smbconfoption> for the previous behaviour of controlling the normal listening sockets.</para>
</description>
<value type="default">0.0.0.0</value>
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,
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0b4f093537..101d62d3a3 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1046,7 +1046,7 @@ char *lp_remote_browse_sync(TALLOC_CTX *ctx);
bool lp_nmbd_bind_explicit_broadcast(void);
const char **lp_wins_server_list(void);
const char **lp_interfaces(void);
-const char *lp_socket_address(void);
+const char *lp_nbt_client_socket_address(void);
char *lp_nis_home_map_name(TALLOC_CTX *ctx);
const char **lp_netbios_aliases(void);
const char *lp_passdb_backend(void);
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index e4dda16659..b62b52bc70 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -216,7 +216,7 @@ char *saf_fetch( const char *domain )
static void set_socket_addr_v4(struct sockaddr_storage *addr)
{
- if (!interpret_string_addr(addr, lp_socket_address(),
+ if (!interpret_string_addr(addr, lp_nbt_client_socket_address(),
AI_NUMERICHOST|AI_PASSIVE)) {
zero_sockaddr(addr);
}
@@ -2071,7 +2071,7 @@ struct tevent_req *resolve_wins_send(TALLOC_CTX *mem_ctx,
}
/* the address we will be sending from */
- if (!interpret_string_addr(&src_ss, lp_socket_address(),
+ if (!interpret_string_addr(&src_ss, lp_nbt_client_socket_address(),
AI_NUMERICHOST|AI_PASSIVE)) {
zero_sockaddr(&src_ss);
}
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index a28ed7c393..1728bb9c5a 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -692,7 +692,7 @@ static void process(struct messaging_context *msg)
static bool open_sockets(bool isdaemon, int port)
{
struct sockaddr_storage ss;
- const char *sock_addr = lp_socket_address();
+ const char *sock_addr = lp_nbt_client_socket_address();
/*
* The sockets opened here will be used to receive broadcast
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4bfcbc2494..59f74d7c8e 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -738,7 +738,7 @@ static void init_globals(bool reinit_globals)
string_set(&Globals.szStateDir, get_dyn_STATEDIR());
string_set(&Globals.szCacheDir, get_dyn_CACHEDIR());
string_set(&Globals.szPidDir, get_dyn_PIDDIR());
- string_set(&Globals.szSocketAddress, "0.0.0.0");
+ string_set(&Globals.nbt_client_socket_address, "0.0.0.0");
/*
* By default support explicit binding to broadcast
* addresses.
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index b767b412e4..0d5e64a8e4 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -40,7 +40,7 @@ static bool find_status = false;
static bool open_sockets(void)
{
struct sockaddr_storage ss;
- const char *sock_addr = lp_socket_address();
+ const char *sock_addr = lp_nbt_client_socket_address();
if (!interpret_string_addr(&ss, sock_addr,
AI_NUMERICHOST|AI_PASSIVE)) {
generated by cgit (git 2.34.1) at 2024-11-08 11:29:23 +0000