diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-03-23 17:32:34 +1100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-05-12 01:32:11 +0200 |
| commit | 4f4e6ebace8ece37a90b08110a74b1a73030b28a (patch) | |
| tree | 1bbaddaf10c93923f8e75ecd67081c37b24acfc0 /source3/lib | |
| parent | c75f297ac3bd2e734ce0b2e794f481e81963518b (diff) | |
| download | samba-4f4e6ebace8ece37a90b08110a74b1a73030b28a.tar.gz | |
ctdb-daemon: Remove older data structure that supports only IPv4 addresses
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/ctdbd_conn.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 85717dd0dcc..748a99ffa74 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -1632,12 +1632,6 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, void *private_data), void *private_data) { - /* - * we still use ctdb_control_tcp for ipv4 - * because we want to work against older ctdb - * versions at runtime - */ - struct ctdb_control_tcp p4; struct ctdb_control_tcp_addr p; TDB_DATA data; NTSTATUS status; @@ -1654,10 +1648,10 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, switch (client.ss_family) { case AF_INET: - memcpy(&p4.dest, &server, sizeof(p4.dest)); - memcpy(&p4.src, &client, sizeof(p4.src)); - data.dptr = (uint8_t *)&p4; - data.dsize = sizeof(p4); + memcpy(&p.dest.ip, &server, sizeof(p.dest.ip)); + memcpy(&p.src.ip, &client, sizeof(p.src.ip)); + data.dptr = (uint8_t *)&p; + data.dsize = sizeof(p); break; case AF_INET6: memcpy(&p.dest.ip6, &server, sizeof(p.dest.ip6)); |