summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-27 12:31:28 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-27 17:59:51 +1000
commitb181a0b96b8313206923e6f5b46b0803aaf64907 (patch)
treecc3d5aba5a971adc68a1e2f65663a528bd468175 /source4
parentec64f7907d290276485e61b540e844bf1c839713 (diff)
downloadsamba-b181a0b96b8313206923e6f5b46b0803aaf64907.tar.gz
samba-b181a0b96b8313206923e6f5b46b0803aaf64907.tar.bz2
samba-b181a0b96b8313206923e6f5b46b0803aaf64907.zip
lib/param: Remove use of lp{cfg,}_socket_address outside the NBT client and server
In these other cases, control of the sockets to bind to can be obtained using "bind interfaces only = yes" and "interfaces = ". Andrew Bartlett
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/socket/interface.c10
-rw-r--r--source4/wrepl_server/wrepl_in_connection.c5
2 files changed, 1 insertions, 14 deletions
diff --git a/source4/lib/socket/interface.c b/source4/lib/socket/interface.c
index 27ac7151a3..7a4733f466 100644
--- a/source4/lib/socket/interface.c
+++ b/source4/lib/socket/interface.c
@@ -502,20 +502,10 @@ bool iface_list_same_net(const char *ip1, const char *ip2, const char *netmask)
/**
return the list of wildcard interfaces
this will include the IPv4 0.0.0.0, and may include IPv6 ::
- it is overridden by the 'socket address' option in smb.conf
*/
const char **iface_list_wildcard(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
{
const char **ret;
- const char *socket_address;
-
- /* the user may have configured a specific address */
- socket_address = lpcfg_socket_address(lp_ctx);
- if (strcmp(socket_address, "") != 0) {
- ret = (const char **)str_list_make(mem_ctx, socket_address, NULL);
- return ret;
- }
-
ret = (const char **)str_list_make(mem_ctx, "0.0.0.0", NULL);
if (ret == NULL) return NULL;
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 962a1cb7fa..251e5a0247 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -467,10 +467,7 @@ NTSTATUS wreplsrv_setup_sockets(struct wreplsrv_service *service, struct loadpar
}
}
} else {
- address = lpcfg_socket_address(lp_ctx);
- if (strcmp(address, "") == 0) {
- address = "0.0.0.0";
- }
+ address = "0.0.0.0";
status = stream_setup_socket(task, task->event_ctx, task->lp_ctx,
model_ops, &wreplsrv_stream_ops,
"ipv4", address, &port, lpcfg_socket_options(task->lp_ctx),