summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-14 12:09:46 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-16 15:16:59 +0100
commitdc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12 (patch)
treee199445195020bde967d7d8b1b6d28e76ba74ec8 /source3/smbd
parent6a94b7b9270f3d69595b93e2632051c9842645c9 (diff)
downloadsamba-dc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12.tar.gz
samba-dc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12.tar.bz2
samba-dc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12.zip
s3:cluster: fix ctdb ipv6 support
We need to use CTDB_CONTROL_TCP_CLIENT instead of CTDB_CONTROL_TCP_ADD. CTDB_CONTROL_TCP_CLIENT has support for 2 modes in newer ctdb versions: - with struct ctdb_control_tcp it only supports ipv4. - with struct ctdb_control_tcp_addr it supports ipv4 and ipv6. You need new header files which defines struct ctdb_control_tcp_addr, but at runtime it should be fine to work against older ctdb versions (<= 1.0.68). metze
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 00e939e2b8..a884914839 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1458,9 +1458,7 @@ extern void build_options(bool screen);
status = ctdbd_register_ips(
messaging_ctdbd_connection(),
- (struct sockaddr *)&srv,
- (struct sockaddr *)&clnt,
- release_ip, NULL);
+ &srv, &clnt, release_ip, NULL);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("ctdbd_register_ips failed: %s\n",