build: Remove checks for ctdb features

[obnox/samba/samba-obnox.git] / source3 / lib / ctdbd_conn.c

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index a667482f6b2930bad46db094f3f8b2dc2a790dbf..fe3e25ad320fd8575bd092900fbb5c02dbed4d8b 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1110,20 +1110,13 @@ fail:
 
 bool ctdb_serverids_exist_supported(struct ctdbd_connection *conn)
 {
-#ifndef HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL
-       return false;
-#else /* HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL */
        return true;
-#endif /* HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL */
 }
 
 bool ctdb_serverids_exist(struct ctdbd_connection *conn,
                          const struct server_id *pids, unsigned num_pids,
                          bool *results)
 {
-#ifndef HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL
-       return false;
-#else /* HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL */
        unsigned i, num_received;
        NTSTATUS status;
        struct ctdb_vnn_list *vnns = NULL;
@@ -1267,7 +1260,6 @@ bool ctdb_serverids_exist(struct ctdbd_connection *conn,
 fail:
        cluster_fatal("serverids_exist failed");
        return false;
-#endif /* HAVE_CTDB_CONTROL_CHECK_SRVIDS_DECL */
 }
 
 /*
@@ -1421,11 +1413,7 @@ NTSTATUS ctdbd_parse(struct ctdbd_connection *conn, uint32_t db_id,
        NTSTATUS status;
        uint32_t flags;
 
-#ifdef HAVE_CTDB_WANT_READONLY_DECL
        flags = local_copy ? CTDB_WANT_READONLY : 0;
-#else
-       flags = 0;
-#endif
 
        ZERO_STRUCT(req);
 
@@ -1633,9 +1621,7 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
         * versions at runtime
         */
        struct ctdb_control_tcp p4;
-#ifdef HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR
        struct ctdb_control_tcp_addr p;
-#endif
        TDB_DATA data;
        NTSTATUS status;
        struct sockaddr_storage client;
@@ -1656,14 +1642,12 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
                data.dptr = (uint8_t *)&p4;
                data.dsize = sizeof(p4);
                break;
-#ifdef HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR
        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;
-#endif
        default:
                return NT_STATUS_INTERNAL_ERROR;
        }