summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-06-02 18:20:13 +1000
committerAndrew Tridgell <tridge@samba.org>2011-06-06 12:26:10 +1000
commitb34013d5377926303d1ea60259f6853c8684cf8b (patch)
tree4820eb81c17677c5c85a1378d92660eabaa0c6e6 /source4
parent74a7e68925c27b0bce26a4f6775b3d08ba1767e0 (diff)
downloadsamba-b34013d5377926303d1ea60259f6853c8684cf8b.tar.gz
samba-b34013d5377926303d1ea60259f6853c8684cf8b.tar.bz2
samba-b34013d5377926303d1ea60259f6853c8684cf8b.zip
s4-ipv6: ensure wrepl server does not use ipv6
WINS only does IPv4
Diffstat (limited to 'source4')
-rw-r--r--source4/wrepl_server/wrepl_in_connection.c3
-rw-r--r--source4/wrepl_server/wrepl_server.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 9eaf10f52c..962a1cb7fa 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -468,6 +468,9 @@ 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";
+ }
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),
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 7b420e3d91..79e0cfc24d 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -79,7 +79,7 @@ static NTSTATUS wreplsrv_open_winsdb(struct wreplsrv_service *service,
if (owner == NULL) {
struct interface *ifaces;
load_interface_list(service, lp_ctx, &ifaces);
- owner = iface_list_n_ip(ifaces, 0);
+ owner = iface_list_first_v4(ifaces);
}
service->wins_db = winsdb_connect(service, service->task->event_ctx, lp_ctx, owner, WINSDB_HANDLE_CALLER_WREPL);