ctdbd_conn: simplify ctdbd_register_ips
authorVolker Lendecke <vl@samba.org>
Wed, 20 May 2015 06:12:46 +0000 (08:12 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 28 May 2015 09:13:09 +0000 (11:13 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/lib/ctdbd_conn.c

index d380b458bf80798944bbad499fcd3630bc3ee357..a1e44ac1a4b712cf2d5c6e45d94b5979a2c61d43 100644 (file)
@@ -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;