From 7ce9f3f3f5c95506105b14022b1327f12bbcb229 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 20 May 2015 08:12:46 +0200 Subject: [PATCH] ctdbd_conn: simplify ctdbd_register_ips Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source3/lib/ctdbd_conn.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index d380b458bf8..a1e44ac1a4b 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -1496,7 +1496,7 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, void *private_data) { struct ctdb_control_tcp_addr p; - TDB_DATA data; + TDB_DATA data = { .dptr = (uint8_t *)&p, .dsize = sizeof(p) }; NTSTATUS status; struct sockaddr_storage client; struct sockaddr_storage server; @@ -1513,14 +1513,10 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, case AF_INET: 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)); memcpy(&p.src.ip6, &client, sizeof(p.src.ip6)); - data.dptr = (uint8_t *)&p; - data.dsize = sizeof(p); break; default: return NT_STATUS_INTERNAL_ERROR; -- 2.11.4.GIT