s3-talloc Change TALLOC_ARRAY() to talloc_array()
[sfrench/samba-autobuild/.git] / source3 / lib / ctdbd_conn.c
index 47693ec621e7180d89efe6675cb2b8eddf5fd796..f42290695a79ab3b2ca0552fa18435c094c42dfc 100644 (file)
@@ -3,27 +3,29 @@
    Samba internal messaging functions
    Copyright (C) 2007 by Volker Lendecke
    Copyright (C) 2007 by Andrew Tridgell
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "util_tdb.h"
 
 #ifdef CLUSTER_SUPPORT
 
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_messaging.h"
+#include "ctdbd_conn.h"
+#include "ctdb_packet.h"
+#include "messages.h"
 
 /* paths to these include files come from --with-ctdb= in configure */
 #include "ctdb.h"
@@ -34,16 +36,16 @@ struct ctdbd_connection {
        uint32 reqid;
        uint32 our_vnn;
        uint64 rand_srvid;
-       struct packet_context *pkt;
+       struct ctdb_packet_context *pkt;
        struct fd_event *fde;
-       
+
        void (*release_ip_handler)(const char *ip_addr, void *private_data);
        void *release_ip_priv;
 };
 
 static NTSTATUS ctdbd_control(struct ctdbd_connection *conn,
                              uint32_t vnn, uint32 opcode, 
-                             uint64_t srvid, TDB_DATA data, 
+                             uint64_t srvid, uint32_t flags, TDB_DATA data, 
                              TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
                              int *cstatus);
 
@@ -57,7 +59,7 @@ static void cluster_fatal(const char *why)
           a core file. We need to release this process id immediately
           so that someone else can take over without getting sharing
           violations */
-       _exit(0);
+       _exit(1);
 }
 
 /*
@@ -83,7 +85,7 @@ static NTSTATUS register_with_ctdbd(struct ctdbd_connection *conn,
 
        int cstatus;
        return ctdbd_control(conn, CTDB_CURRENT_NODE,
-                            CTDB_CONTROL_REGISTER_SRVID, srvid,
+                            CTDB_CONTROL_REGISTER_SRVID, srvid, 0,
                             tdb_null, NULL, NULL, &cstatus);
 }
 
@@ -95,7 +97,7 @@ static NTSTATUS get_cluster_vnn(struct ctdbd_connection *conn, uint32 *vnn)
        int32_t cstatus=-1;
        NTSTATUS status;
        status = ctdbd_control(conn,
-                              CTDB_CURRENT_NODE, CTDB_CONTROL_GET_PNN, 0,
+                              CTDB_CURRENT_NODE, CTDB_CONTROL_GET_PNN, 0, 0,
                               tdb_null, NULL, NULL, &cstatus);
        if (!NT_STATUS_IS_OK(status)) {
                cluster_fatal("ctdbd_control failed\n");
@@ -104,6 +106,59 @@ static NTSTATUS get_cluster_vnn(struct ctdbd_connection *conn, uint32 *vnn)
        return status;
 }
 
+/*
+ * Are we active (i.e. not banned or stopped?)
+ */
+static bool ctdbd_working(struct ctdbd_connection *conn, uint32_t vnn)
+{
+       int32_t cstatus=-1;
+       NTSTATUS status;
+       TDB_DATA outdata;
+       struct ctdb_node_map *m;
+       uint32_t failure_flags;
+       bool ret = false;
+       int i;
+
+       status = ctdbd_control(conn, CTDB_CURRENT_NODE,
+                              CTDB_CONTROL_GET_NODEMAP, 0, 0,
+                              tdb_null, talloc_tos(), &outdata, &cstatus);
+       if (!NT_STATUS_IS_OK(status)) {
+               cluster_fatal("ctdbd_control failed\n");
+       }
+       if ((cstatus != 0) || (outdata.dptr == NULL)) {
+               DEBUG(2, ("Received invalid ctdb data\n"));
+               return false;
+       }
+
+       m = (struct ctdb_node_map *)outdata.dptr;
+
+       for (i=0; i<m->num; i++) {
+               if (vnn == m->nodes[i].pnn) {
+                       break;
+               }
+       }
+
+       if (i == m->num) {
+               DEBUG(2, ("Did not find ourselves (node %d) in nodemap\n",
+                         (int)vnn));
+               goto fail;
+       }
+
+       failure_flags = NODE_FLAGS_BANNED | NODE_FLAGS_DISCONNECTED
+               | NODE_FLAGS_PERMANENTLY_DISABLED | NODE_FLAGS_STOPPED;
+
+       if ((m->nodes[i].flags & failure_flags) != 0) {
+               DEBUG(2, ("Node has status %x, not active\n",
+                         (int)m->nodes[i].flags));
+               goto fail;
+       }
+
+       ret = true;
+fail:
+       TALLOC_FREE(outdata.dptr);
+       return ret;
+}
+
 uint32 ctdbd_vnn(const struct ctdbd_connection *conn)
 {
        return conn->our_vnn;
@@ -114,9 +169,9 @@ uint32 ctdbd_vnn(const struct ctdbd_connection *conn)
  */
 
 static NTSTATUS ctdbd_connect(TALLOC_CTX *mem_ctx,
-                             struct packet_context **presult)
+                             struct ctdb_packet_context **presult)
 {
-       struct packet_context *result;
+       struct ctdb_packet_context *result;
        const char *sockname = lp_ctdbd_socket();
        struct sockaddr_un addr;
        int fd;
@@ -135,14 +190,14 @@ static NTSTATUS ctdbd_connect(TALLOC_CTX *mem_ctx,
        addr.sun_family = AF_UNIX;
        strncpy(addr.sun_path, sockname, sizeof(addr.sun_path));
 
-       if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
-               DEBUG(0, ("connect(%s) failed: %s\n", sockname,
+       if (sys_connect(fd, (struct sockaddr *)(void *)&addr) == -1) {
+               DEBUG(1, ("connect(%s) failed: %s\n", sockname,
                          strerror(errno)));
                close(fd);
                return map_nt_error_from_unix(errno);
        }
 
-       if (!(result = packet_init(mem_ctx, fd))) {
+       if (!(result = ctdb_packet_init(mem_ctx, fd))) {
                close(fd);
                return NT_STATUS_NO_MEMORY;
        }
@@ -155,17 +210,17 @@ static NTSTATUS ctdbd_connect(TALLOC_CTX *mem_ctx,
  * Do we have a complete ctdb packet in the queue?
  */
 
-static bool ctdb_req_complete(const struct data_blob *data,
+static bool ctdb_req_complete(const uint8_t *buf, size_t available,
                              size_t *length,
                              void *private_data)
 {
        uint32 msglen;
 
-       if (data->length < sizeof(msglen)) {
+       if (available < sizeof(msglen)) {
                return False;
        }
 
-       msglen = *((uint32 *)data->data);
+       msglen = *((uint32 *)buf);
 
        DEBUG(10, ("msglen = %d\n", msglen));
 
@@ -176,12 +231,12 @@ static bool ctdb_req_complete(const struct data_blob *data,
                cluster_fatal("ctdbd protocol error\n");
        }
 
-       if (data->length >= msglen) {
-               *length = msglen;
-               return True;
+       if (available < msglen) {
+               return false;
        }
 
-       return False;
+       *length = msglen;
+       return true;
 }
 
 /*
@@ -200,7 +255,7 @@ struct deferred_msg_state {
 
 static void deferred_message_dispatch(struct event_context *event_ctx,
                                      struct timed_event *te,
-                                     const struct timeval *now,
+                                     struct timeval now,
                                      void *private_data)
 {
        struct deferred_msg_state *state = talloc_get_type_abort(
@@ -217,19 +272,16 @@ struct req_pull_state {
 };
 
 /*
- * Pull a ctdb request out of the incoming packet queue
+ * Pull a ctdb request out of the incoming ctdb_packet queue
  */
 
-static NTSTATUS ctdb_req_pull(const struct data_blob *data,
+static NTSTATUS ctdb_req_pull(uint8_t *buf, size_t length,
                              void *private_data)
 {
        struct req_pull_state *state = (struct req_pull_state *)private_data;
 
-       state->req = data_blob_talloc(state->mem_ctx, data->data,
-                                     data->length);
-       if (state->req.data == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       state->req.data = talloc_move(state->mem_ctx, &buf);
+       state->req.length = length;
        return NT_STATUS_OK;
 }
 
@@ -278,6 +330,16 @@ static struct messaging_rec *ctdb_pull_messaging_rec(TALLOC_CTX *mem_ctx,
        return result;
 }
 
+static NTSTATUS ctdb_packet_fd_read_sync(struct ctdb_packet_context *ctx)
+{
+       int timeout = lp_ctdb_timeout();
+
+       if (timeout == 0) {
+               timeout = -1;
+       }
+       return ctdb_packet_fd_read_sync_timeout(ctx, timeout);
+}
+
 /*
  * Read a full ctdbd request. If we have a messaging context, defer incoming
  * messages that might come in between.
@@ -292,7 +354,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
 
  again:
 
-       status = packet_fd_read_sync(conn->pkt);
+       status = ctdb_packet_fd_read_sync(conn->pkt);
 
        if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_BUSY)) {
                /* EAGAIN */
@@ -303,7 +365,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
        }
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("packet_fd_read failed: %s\n", nt_errstr(status)));
+               DEBUG(0, ("ctdb_packet_fd_read failed: %s\n", nt_errstr(status)));
                cluster_fatal("ctdbd died\n");
        }
 
@@ -312,7 +374,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
        ZERO_STRUCT(state);
        state.mem_ctx = mem_ctx;
 
-       if (!packet_handler(conn->pkt, ctdb_req_complete, ctdb_req_pull,
+       if (!ctdb_packet_handler(conn->pkt, ctdb_req_complete, ctdb_req_pull,
                            &state, &status)) {
                /*
                 * Not enough data
@@ -322,7 +384,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
        }
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("Could not read packet: %s\n", nt_errstr(status)));
+               DEBUG(0, ("Could not read ctdb_packet: %s\n", nt_errstr(status)));
                cluster_fatal("ctdbd died\n");
        }
 
@@ -342,7 +404,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
                                  (long long unsigned)msg->srvid));
                        goto next_pkt;
                }
-               
+
                if ((conn->release_ip_handler != NULL)
                    && (msg->srvid == CTDB_SRVID_RELEASE_IP)) {
                        /* must be dispatched immediately */
@@ -353,7 +415,26 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
                        goto next_pkt;
                }
 
-               if (!(msg_state = TALLOC_P(NULL, struct deferred_msg_state))) {
+               if ((msg->srvid == CTDB_SRVID_RECONFIGURE)
+                   || (msg->srvid == CTDB_SRVID_SAMBA_NOTIFY)) {
+
+                       DEBUG(1, ("ctdb_read_req: Got %s message\n",
+                                 (msg->srvid == CTDB_SRVID_RECONFIGURE)
+                                 ? "cluster reconfigure" : "SAMBA_NOTIFY"));
+
+                       messaging_send(conn->msg_ctx,
+                                      messaging_server_id(conn->msg_ctx),
+                                      MSG_SMB_BRL_VALIDATE, &data_blob_null);
+                       messaging_send(conn->msg_ctx,
+                                      messaging_server_id(conn->msg_ctx),
+                                      MSG_DBWRAP_G_LOCK_RETRY,
+                                      &data_blob_null);
+                       TALLOC_FREE(hdr);
+                       goto next_pkt;
+               }
+
+               msg_state = TALLOC_P(NULL, struct deferred_msg_state);
+               if (msg_state == NULL) {
                        DEBUG(0, ("talloc failed\n"));
                        TALLOC_FREE(hdr);
                        goto next_pkt;
@@ -370,7 +451,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
                TALLOC_FREE(hdr);
 
                msg_state->msg_ctx = conn->msg_ctx;
-               
+
                /*
                 * We're waiting for a call reply, but an async message has
                 * crossed. Defer dispatching to the toplevel event loop.
@@ -378,7 +459,6 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
                evt = event_add_timed(conn->msg_ctx->event_ctx,
                                      conn->msg_ctx->event_ctx,
                                      timeval_zero(),
-                                     "deferred_message_dispatch",
                                      deferred_message_dispatch,
                                      msg_state);
                if (evt == NULL) {
@@ -387,7 +467,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
                        TALLOC_FREE(hdr);
                        goto next_pkt;
                }
-               
+
                goto next_pkt;
        }
 
@@ -408,8 +488,8 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection *conn, uint32 reqid,
  * Get us a ctdbd connection
  */
 
-NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
-                              struct ctdbd_connection **pconn)
+static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
+                                     struct ctdbd_connection **pconn)
 {
        struct ctdbd_connection *conn;
        NTSTATUS status;
@@ -433,6 +513,12 @@ NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
                goto fail;
        }
 
+       if (!ctdbd_working(conn, conn->our_vnn)) {
+               DEBUG(2, ("Node is not working, can not connect\n"));
+               status = NT_STATUS_INTERNAL_DB_ERROR;
+               goto fail;
+       }
+
        generate_random_buffer((unsigned char *)&conn->rand_srvid,
                               sizeof(conn->rand_srvid));
 
@@ -478,6 +564,11 @@ NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
                goto fail;
        }
 
+       status = register_with_ctdbd(conn, CTDB_SRVID_SAMBA_NOTIFY);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
        *pconn = conn;
        return NT_STATUS_OK;
 
@@ -486,10 +577,20 @@ NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
        return status;
 }
 
+struct messaging_context *ctdb_conn_msg_ctx(struct ctdbd_connection *conn)
+{
+       return conn->msg_ctx;
+}
+
+int ctdbd_conn_get_fd(struct ctdbd_connection *conn)
+{
+       return ctdb_packet_get_fd(conn->pkt);
+}
+
 /*
  * Packet handler to receive and handle a ctdb message
  */
-static NTSTATUS ctdb_handle_message(const struct data_blob *data,
+static NTSTATUS ctdb_handle_message(uint8_t *buf, size_t length,
                                    void *private_data)
 {
        struct ctdbd_connection *conn = talloc_get_type_abort(
@@ -497,11 +598,12 @@ static NTSTATUS ctdb_handle_message(const struct data_blob *data,
        struct ctdb_req_message *msg;
        struct messaging_rec *msg_rec;
 
-       msg = (struct ctdb_req_message *)data->data;
+       msg = (struct ctdb_req_message *)buf;
 
        if (msg->hdr.operation != CTDB_REQ_MESSAGE) {
                DEBUG(0, ("Received async msg of type %u, discarding\n",
                          msg->hdr.operation));
+               TALLOC_FREE(buf);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
@@ -511,46 +613,51 @@ static NTSTATUS ctdb_handle_message(const struct data_blob *data,
                DEBUG(10, ("received CTDB_SRVID_RELEASE_IP\n"));
                conn->release_ip_handler((const char *)msg->data,
                                         conn->release_ip_priv);
+               TALLOC_FREE(buf);
                return NT_STATUS_OK;
        }
 
        SMB_ASSERT(conn->msg_ctx != NULL);
 
-       if (msg->srvid == CTDB_SRVID_RECONFIGURE) {
+       if ((msg->srvid == CTDB_SRVID_RECONFIGURE)
+           || (msg->srvid == CTDB_SRVID_SAMBA_NOTIFY)){
                DEBUG(0,("Got cluster reconfigure message\n"));
                /*
-                * when the cluster is reconfigured, we need to clean the brl
-                * database
+                * when the cluster is reconfigured or someone of the
+                * family has passed away (SAMBA_NOTIFY), we need to
+                * clean the brl database
                 */
-               messaging_send(conn->msg_ctx, procid_self(),
+               messaging_send(conn->msg_ctx,
+                              messaging_server_id(conn->msg_ctx),
                               MSG_SMB_BRL_VALIDATE, &data_blob_null);
 
-               /*
-                * it's possible that we have just rejoined the cluster after
-                * an outage. In that case our pending locks could have been
-                * removed from the lockdb, so retry them once more
-                */
-               message_send_all(conn->msg_ctx, MSG_SMB_UNLOCK, NULL, 0, NULL);
+               messaging_send(conn->msg_ctx,
+                              messaging_server_id(conn->msg_ctx),
+                              MSG_DBWRAP_G_LOCK_RETRY,
+                              &data_blob_null);
 
+               TALLOC_FREE(buf);
                return NT_STATUS_OK;
-               
        }
 
        /* only messages to our pid or the broadcast are valid here */
        if (msg->srvid != sys_getpid() && msg->srvid != MSG_SRVID_SAMBA) {
                DEBUG(0,("Got unexpected message with srvid=%llu\n", 
                         (unsigned long long)msg->srvid));
+               TALLOC_FREE(buf);
                return NT_STATUS_OK;
        }
 
-       if (!(msg_rec = ctdb_pull_messaging_rec(NULL, data->length, msg))) {
+       if (!(msg_rec = ctdb_pull_messaging_rec(NULL, length, msg))) {
                DEBUG(10, ("ctdb_pull_messaging_rec failed\n"));
+               TALLOC_FREE(buf);
                return NT_STATUS_NO_MEMORY;
        }
 
        messaging_dispatch_rec(conn->msg_ctx, msg_rec);
 
        TALLOC_FREE(msg_rec);
+       TALLOC_FREE(buf);
        return NT_STATUS_OK;
 }
 
@@ -568,14 +675,14 @@ static void ctdbd_socket_handler(struct event_context *event_ctx,
 
        NTSTATUS status;
 
-       status = packet_fd_read(conn->pkt);
+       status = ctdb_packet_fd_read(conn->pkt);
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("packet_fd_read failed: %s\n", nt_errstr(status)));
                cluster_fatal("ctdbd died\n");
        }
 
-       while (packet_handler(conn->pkt, ctdb_req_complete,
+       while (ctdb_packet_handler(conn->pkt, ctdb_req_complete,
                              ctdb_handle_message, conn, &status)) {
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(10, ("could not handle incoming message: %s\n",
@@ -595,7 +702,7 @@ NTSTATUS ctdbd_register_msg_ctx(struct ctdbd_connection *conn,
        SMB_ASSERT(conn->fde == NULL);
 
        if (!(conn->fde = event_add_fd(msg_ctx->event_ctx, conn,
-                                      packet_get_fd(conn->pkt),
+                                      ctdb_packet_get_fd(conn->pkt),
                                       EVENT_FD_READ,
                                       ctdbd_socket_handler,
                                       conn))) {
@@ -652,17 +759,17 @@ NTSTATUS ctdbd_messaging_send(struct ctdbd_connection *conn,
        DEBUG(10, ("ctdbd_messaging_send: Sending ctdb packet\n"));
        ctdb_packet_dump(&r.hdr);
 
-       status = packet_send(
+       status = ctdb_packet_send(
                conn->pkt, 2,
                data_blob_const(&r, offsetof(struct ctdb_req_message, data)),
                blob);
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("packet_send failed: %s\n", nt_errstr(status)));
+               DEBUG(0, ("ctdb_packet_send failed: %s\n", nt_errstr(status)));
                goto fail;
        }
 
-       status = packet_flush(conn->pkt);
+       status = ctdb_packet_flush(conn->pkt);
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(3, ("write to ctdbd failed: %s\n", nt_errstr(status)));
@@ -680,7 +787,8 @@ NTSTATUS ctdbd_messaging_send(struct ctdbd_connection *conn,
  */
 static NTSTATUS ctdbd_control(struct ctdbd_connection *conn,
                              uint32_t vnn, uint32 opcode, 
-                             uint64_t srvid, TDB_DATA data, 
+                             uint64_t srvid, uint32_t flags, 
+                             TDB_DATA data, 
                              TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
                              int *cstatus)
 {
@@ -711,27 +819,36 @@ static NTSTATUS ctdbd_control(struct ctdbd_connection *conn,
        req.opcode           = opcode;
        req.srvid            = srvid;
        req.datalen          = data.dsize;
+       req.flags            = flags;
 
        DEBUG(10, ("ctdbd_control: Sending ctdb packet\n"));
        ctdb_packet_dump(&req.hdr);
 
-       status = packet_send(
+       status = ctdb_packet_send(
                conn->pkt, 2,
                data_blob_const(&req, offsetof(struct ctdb_req_control, data)),
                data_blob_const(data.dptr, data.dsize));
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(3, ("packet_send failed: %s\n", nt_errstr(status)));
+               DEBUG(3, ("ctdb_packet_send failed: %s\n", nt_errstr(status)));
                goto fail;
        }
 
-       status = packet_flush(conn->pkt);
+       status = ctdb_packet_flush(conn->pkt);
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(3, ("write to ctdbd failed: %s\n", nt_errstr(status)));
                cluster_fatal("cluster dispatch daemon control write error\n");
        }
 
+       if (flags & CTDB_CTRL_FLAG_NOREPLY) {
+               TALLOC_FREE(new_conn);
+               if (cstatus) {
+                       *cstatus = 0;
+               }
+               return NT_STATUS_OK;
+       }
+
        status = ctdb_read_req(conn, req.hdr.reqid, NULL, (void *)&reply);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -776,7 +893,7 @@ bool ctdbd_process_exists(struct ctdbd_connection *conn, uint32 vnn, pid_t pid)
        data.dptr = (uint8_t*)&pid;
        data.dsize = sizeof(pid);
 
-       status = ctdbd_control(conn, vnn, CTDB_CONTROL_PROCESS_EXISTS, 0,
+       status = ctdbd_control(conn, vnn, CTDB_CONTROL_PROCESS_EXISTS, 0, 0,
                               data, NULL, NULL, &cstatus);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, (__location__ " ctdb_control for process_exists "
@@ -801,7 +918,7 @@ char *ctdbd_dbpath(struct ctdbd_connection *conn,
        data.dsize = sizeof(db_id);
 
        status = ctdbd_control(conn, CTDB_CURRENT_NODE,
-                              CTDB_CONTROL_GETDBPATH, 0, data, 
+                              CTDB_CONTROL_GETDBPATH, 0, 0, data, 
                               mem_ctx, &data, &cstatus);
        if (!NT_STATUS_IS_OK(status) || cstatus != 0) {
                DEBUG(0,(__location__ " ctdb_control for getdbpath failed\n"));
@@ -820,13 +937,16 @@ NTSTATUS ctdbd_db_attach(struct ctdbd_connection *conn,
        NTSTATUS status;
        TDB_DATA data;
        int32_t cstatus;
+       bool persistent = (tdb_flags & TDB_CLEAR_IF_FIRST) == 0;
 
        data.dptr = (uint8_t*)name;
        data.dsize = strlen(name)+1;
 
        status = ctdbd_control(conn, CTDB_CURRENT_NODE,
-                              CTDB_CONTROL_DB_ATTACH, 0, data, 
-                              NULL, &data, &cstatus);
+                              persistent
+                              ? CTDB_CONTROL_DB_ATTACH_PERSISTENT
+                              : CTDB_CONTROL_DB_ATTACH,
+                              tdb_flags, 0, data, NULL, &data, &cstatus);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, (__location__ " ctdb_control for db_attach "
                          "failed: %s\n", nt_errstr(status)));
@@ -849,7 +969,7 @@ NTSTATUS ctdbd_db_attach(struct ctdbd_connection *conn,
        data.dsize = sizeof(*db_id);
 
        status = ctdbd_control(conn, CTDB_CURRENT_NODE,
-                              CTDB_CONTROL_ENABLE_SEQNUM, 0, data, 
+                              CTDB_CONTROL_ENABLE_SEQNUM, 0, 0, data, 
                               NULL, NULL, &cstatus);
        if (!NT_STATUS_IS_OK(status) || cstatus != 0) {
                DEBUG(0,(__location__ " ctdb_control for enable seqnum "
@@ -872,7 +992,7 @@ NTSTATUS ctdbd_migrate(struct ctdbd_connection *conn, uint32 db_id,
        NTSTATUS status;
 
        ZERO_STRUCT(req);
-       
+
        req.hdr.length = offsetof(struct ctdb_req_call, data) + key.dsize;
        req.hdr.ctdb_magic   = CTDB_MAGIC;
        req.hdr.ctdb_version = CTDB_VERSION;
@@ -886,17 +1006,17 @@ NTSTATUS ctdbd_migrate(struct ctdbd_connection *conn, uint32 db_id,
        DEBUG(10, ("ctdbd_migrate: Sending ctdb packet\n"));
        ctdb_packet_dump(&req.hdr);
 
-       status = packet_send(
+       status = ctdb_packet_send(
                conn->pkt, 2,
                data_blob_const(&req, offsetof(struct ctdb_req_call, data)),
                data_blob_const(key.dptr, key.dsize));
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(3, ("packet_send failed: %s\n", nt_errstr(status)));
+               DEBUG(3, ("ctdb_packet_send failed: %s\n", nt_errstr(status)));
                return status;
        }
 
-       status = packet_flush(conn->pkt);
+       status = ctdb_packet_flush(conn->pkt);
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(3, ("write to ctdbd failed: %s\n", nt_errstr(status)));
@@ -934,7 +1054,7 @@ NTSTATUS ctdbd_fetch(struct ctdbd_connection *conn, uint32 db_id,
        NTSTATUS status;
 
        ZERO_STRUCT(req);
-       
+
        req.hdr.length = offsetof(struct ctdb_req_call, data) + key.dsize;
        req.hdr.ctdb_magic   = CTDB_MAGIC;
        req.hdr.ctdb_version = CTDB_VERSION;
@@ -945,17 +1065,17 @@ NTSTATUS ctdbd_fetch(struct ctdbd_connection *conn, uint32 db_id,
        req.db_id            = db_id;
        req.keylen           = key.dsize;
 
-       status = packet_send(
+       status = ctdb_packet_send(
                conn->pkt, 2,
                data_blob_const(&req, offsetof(struct ctdb_req_call, data)),
                data_blob_const(key.dptr, key.dsize));
 
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(3, ("packet_send failed: %s\n", nt_errstr(status)));
+               DEBUG(3, ("ctdb_packet_send failed: %s\n", nt_errstr(status)));
                return status;
        }
 
-       status = packet_flush(conn->pkt);
+       status = ctdb_packet_flush(conn->pkt);
 
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(3, ("write to ctdbd failed: %s\n", nt_errstr(status)));
@@ -1005,7 +1125,7 @@ struct ctdbd_traverse_state {
  * Handle a traverse record coming in on the ctdbd connection
  */
 
-static NTSTATUS ctdb_traverse_handler(const struct data_blob *blob,
+static NTSTATUS ctdb_traverse_handler(uint8_t *buf, size_t length,
                                      void *private_data)
 {
        struct ctdbd_traverse_state *state =
@@ -1015,11 +1135,11 @@ static NTSTATUS ctdb_traverse_handler(const struct data_blob *blob,
        struct ctdb_rec_data *d;
        TDB_DATA key, data;
 
-       m = (struct ctdb_req_message *)blob->data;
+       m = (struct ctdb_req_message *)buf;
 
-       if (blob->length < sizeof(*m) || m->hdr.length != blob->length) {
-               DEBUG(0, ("Got invalid message of length %d\n",
-                         (int)blob->length));
+       if (length < sizeof(*m) || m->hdr.length != length) {
+               DEBUG(0, ("Got invalid message of length %d\n", (int)length));
+               TALLOC_FREE(buf);
                return NT_STATUS_UNEXPECTED_IO_ERROR;
        }
 
@@ -1027,6 +1147,7 @@ static NTSTATUS ctdb_traverse_handler(const struct data_blob *blob,
        if (m->datalen < sizeof(uint32_t) || m->datalen != d->length) {
                DEBUG(0, ("Got invalid traverse data of length %d\n",
                          (int)m->datalen));
+               TALLOC_FREE(buf);
                return NT_STATUS_UNEXPECTED_IO_ERROR;
        }
 
@@ -1043,6 +1164,7 @@ static NTSTATUS ctdb_traverse_handler(const struct data_blob *blob,
        if (data.dsize < sizeof(struct ctdb_ltdb_header)) {
                DEBUG(0, ("Got invalid ltdb header length %d\n",
                          (int)data.dsize));
+               TALLOC_FREE(buf);
                return NT_STATUS_UNEXPECTED_IO_ERROR;
        }
        data.dsize -= sizeof(struct ctdb_ltdb_header);
@@ -1052,6 +1174,7 @@ static NTSTATUS ctdb_traverse_handler(const struct data_blob *blob,
                state->fn(key, data, state->private_data);
        }
 
+       TALLOC_FREE(buf);
        return NT_STATUS_OK;
 }
 
@@ -1075,6 +1198,11 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
        struct ctdbd_traverse_state state;
 
        status = ctdbd_init_connection(NULL, &conn);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("ctdbd_init_connection failed: %s\n",
+                         nt_errstr(status)));
+               return status;
+       }
 
        t.db_id = db_id;
        t.srvid = conn->rand_srvid;
@@ -1084,7 +1212,7 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
        data.dsize = sizeof(t);
 
        status = ctdbd_control(conn, CTDB_CURRENT_NODE,
-                              CTDB_CONTROL_TRAVERSE_START, conn->rand_srvid,
+                              CTDB_CONTROL_TRAVERSE_START, conn->rand_srvid, 0,
                               data, NULL, NULL, &cstatus);
 
        if (!NT_STATUS_IS_OK(status) || (cstatus != 0)) {
@@ -1108,7 +1236,7 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
 
                status = NT_STATUS_OK;
 
-               if (packet_handler(conn->pkt, ctdb_req_complete,
+               if (ctdb_packet_handler(conn->pkt, ctdb_req_complete,
                                   ctdb_traverse_handler, &state, &status)) {
 
                        if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
@@ -1126,7 +1254,7 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
                        break;
                }
 
-               status = packet_fd_read_sync(conn->pkt);
+               status = ctdb_packet_fd_read_sync(conn->pkt);
 
                if (NT_STATUS_EQUAL(status, NT_STATUS_RETRY)) {
                        /*
@@ -1137,10 +1265,11 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
 
                if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
                        status = NT_STATUS_OK;
+                       break;
                }
 
                if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0, ("packet_fd_read_sync failed: %s\n", nt_errstr(status)));
+                       DEBUG(0, ("ctdb_packet_fd_read_sync failed: %s\n", nt_errstr(status)));
                        cluster_fatal("ctdbd died\n");
                }
        }
@@ -1150,26 +1279,91 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
        return status;
 }
 
+/*
+   This is used to canonicalize a ctdb_sock_addr structure.
+*/
+static void smbd_ctdb_canonicalize_ip(const struct sockaddr_storage *in,
+                                     struct sockaddr_storage *out)
+{
+       memcpy(out, in, sizeof (*out));
+
+#ifdef HAVE_IPV6
+       if (in->ss_family == AF_INET6) {
+               const char prefix[12] = { 0,0,0,0,0,0,0,0,0,0,0xff,0xff };
+               const struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)in;
+               struct sockaddr_in *out4 = (struct sockaddr_in *)out;
+               if (memcmp(&in6->sin6_addr, prefix, 12) == 0) {
+                       memset(out, 0, sizeof(*out));
+#ifdef HAVE_SOCK_SIN_LEN
+                       out4->sin_len = sizeof(*out);
+#endif
+                       out4->sin_family = AF_INET;
+                       out4->sin_port   = in6->sin6_port;
+                       memcpy(&out4->sin_addr, &in6->sin6_addr.s6_addr32[3], 4);
+               }
+       }
+#endif
+}
+
 /*
  * Register us as a server for a particular tcp connection
  */
 
 NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
-                           const struct sockaddr_in *server,
-                           const struct sockaddr_in *client,
+                           const struct sockaddr_storage *_server,
+                           const struct sockaddr_storage *_client,
                            void (*release_ip_handler)(const char *ip_addr,
                                                       void *private_data),
                            void *private_data)
 {
-       struct ctdb_control_tcp p;
+       /*
+        * we still use ctdb_control_tcp for ipv4
+        * because we want to work against older ctdb
+        * 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;
+       struct sockaddr_storage server;
 
        /*
         * Only one connection so far
         */
        SMB_ASSERT(conn->release_ip_handler == NULL);
 
+       smbd_ctdb_canonicalize_ip(_client, &client);
+       smbd_ctdb_canonicalize_ip(_server, &server);
+
+       switch (client.ss_family) {
+       case AF_INET:
+               p4.dest = *(struct sockaddr_in *)(void *)&server;
+               p4.src = *(struct sockaddr_in *)(void *)&client;
+               data.dptr = (uint8_t *)&p4;
+               data.dsize = sizeof(p4);
+               break;
+#ifdef HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR
+       case AF_INET6:
+               p.dest.ip6 = *(struct sockaddr_in6 *)(void *)&server;
+               p.src.ip6 = *(struct sockaddr_in6 *)(void *)&client;
+               data.dptr = (uint8_t *)&p;
+               data.dsize = sizeof(p);
+               break;
+#endif
+       default:
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+
+       conn->release_ip_handler = release_ip_handler;
+       /*
+        * store the IP address of the server socket for later
+        * comparison in release_ip()
+        */
+       conn->release_ip_priv = private_data;
+
        /*
         * We want to be told about IP releases
         */
@@ -1179,19 +1373,13 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
                return status;
        }
 
-       p.dest = *server;
-       p.src = *client;
-
        /*
         * inform ctdb of our tcp connection, so if IP takeover happens ctdb
         * can send an extra ack to trigger a reset for our client, so it
         * immediately reconnects
         */
-       data.dptr = (uint8_t *)&p;
-       data.dsize = sizeof(p);
-
        return ctdbd_control(conn, CTDB_CURRENT_NODE, 
-                            CTDB_CONTROL_TCP_CLIENT, 
+                            CTDB_CONTROL_TCP_CLIENT, 0,
                             CTDB_CTRL_FLAG_NOREPLY, data, NULL, NULL, NULL);
 }
 
@@ -1203,12 +1391,59 @@ NTSTATUS ctdbd_register_reconfigure(struct ctdbd_connection *conn)
        return register_with_ctdbd(conn, CTDB_SRVID_RECONFIGURE);
 }
 
-#else
+/*
+  call a control on the local node
+ */
+NTSTATUS ctdbd_control_local(struct ctdbd_connection *conn, uint32 opcode, 
+                            uint64_t srvid, uint32_t flags, TDB_DATA data, 
+                            TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
+                            int *cstatus)
+{
+       return ctdbd_control(conn, CTDB_CURRENT_NODE, opcode, srvid, flags, data, mem_ctx, outdata, cstatus);
+}
 
-NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
-                              struct ctdbd_connection **pconn)
+NTSTATUS ctdb_watch_us(struct ctdbd_connection *conn)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       struct ctdb_client_notify_register reg_data;
+       size_t struct_len;
+       NTSTATUS status;
+       int cstatus;
+
+       reg_data.srvid = CTDB_SRVID_SAMBA_NOTIFY;
+       reg_data.len = 1;
+       reg_data.notify_data[0] = 0;
+
+       struct_len = offsetof(struct ctdb_client_notify_register,
+                             notify_data) + reg_data.len;
+
+       status = ctdbd_control_local(
+               conn, CTDB_CONTROL_REGISTER_NOTIFY, conn->rand_srvid, 0,
+               make_tdb_data((uint8_t *)&reg_data, struct_len),
+               NULL, NULL, &cstatus);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("ctdbd_control_local failed: %s\n",
+                         nt_errstr(status)));
+       }
+       return status;
+}
+
+NTSTATUS ctdb_unwatch(struct ctdbd_connection *conn)
+{
+       struct ctdb_client_notify_deregister dereg_data;
+       NTSTATUS status;
+       int cstatus;
+
+       dereg_data.srvid = CTDB_SRVID_SAMBA_NOTIFY;
+
+       status = ctdbd_control_local(
+               conn, CTDB_CONTROL_DEREGISTER_NOTIFY, conn->rand_srvid, 0,
+               make_tdb_data((uint8_t *)&dereg_data, sizeof(dereg_data)),
+               NULL, NULL, &cstatus);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1, ("ctdbd_control_local failed: %s\n",
+                         nt_errstr(status)));
+       }
+       return status;
 }
 
 #endif