sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

lib/param: Rename "socket address" to "nbt client socket address" to clarify role

Browse Source 
This parameter is only used in our NBT client code and in nmbd as a
fallback when we fail to select a better interface from "interfaces"
to use directly.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Jul 27 12:16:25 CEST 2012 on sn-devel-104
This commit is contained in:
Andrew Bartlett 2012-07-27 12:56:22 +10:00
parent b181a0b96b
commit dc00df2add
9 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs-xml/smbdotconf/misc/socketaddress.xml → docs-xml/smbdotconf/misc/nbtclientsocketaddress.xml
View File

@ -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>

2
lib/param/loadparm.c
View File

@ -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);

2
lib/param/param_functions.c
View File

@ -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)

11
lib/param/param_table.c
View File

@ -3476,11 +3476,20 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.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,

2
source3/include/proto.h
View File

@ -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);

4
source3/libsmb/namequery.c
View File

@ -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);
}

2
source3/nmbd/nmbd.c
View File

@ -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

2
source3/param/loadparm.c
View File

@ -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.

2
source3/utils/nmblookup.c
View File

@ -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)) {