merge from ronnie

(This used to be ctdb commit 9253714401de1d7fea6ad44c35f324004683abd7)

diff --cc ctdb/common/ctdb_client.c
index 5715ce9393eee89756ae650652ff16f9a4791ff7,5bfe0ff552de33428df54bd723781380df603a39..d5d54aa339e1df905e5c9fca381a9514991caa21
--- 1/ctdb/common/ctdb_client.c
--- 2/ctdb/common/ctdb_client.c
+++ b/ctdb/common/ctdb_client.c
@@@ -446,14 -446,16 +446,15 @@@ int ctdb_send_message(struct ctdb_conte
   */
  void ctdb_connect_wait(struct ctdb_context *ctdb)
  {
 -      struct ctdb_req_connect_wait r;
 +      struct ctdb_req_connect_wait *r;
        int res;
  
 -      ZERO_STRUCT(r);
 -
 -      r.hdr.length     = sizeof(r);
 -      r.hdr.ctdb_magic = CTDB_MAGIC;
 -      r.hdr.ctdb_version = CTDB_VERSION;
 -      r.hdr.generation= ctdb->vnn_map->generation;
 -      r.hdr.operation = CTDB_REQ_CONNECT_WAIT;
 +      r = ctdbd_allocate_pkt(ctdb, sizeof(*r));
 +      r->hdr.length     = sizeof(*r);
 +      r->hdr.ctdb_magic = CTDB_MAGIC;
 +      r->hdr.ctdb_version = CTDB_VERSION;
 +      r->hdr.operation = CTDB_REQ_CONNECT_WAIT;
++      r->hdr.generation= ctdb->vnn_map->generation;
  
        DEBUG(3,("ctdb_connect_wait: sending to ctdbd\n"));
  

diff --cc ctdb/common/ctdb_control.c
Simple merge

diff --cc ctdb/common/ctdb_daemon.c
index 124bc8a656a12a21c738bea45cdc5c20b4687546,db1447c53b5e61d900b42fcc0fb381ec58f0a9d3..a4307148a6743e88a2b4d1266046aac69844aa50
--- 1/ctdb/common/ctdb_daemon.c
--- 2/ctdb/common/ctdb_daemon.c
+++ b/ctdb/common/ctdb_daemon.c
@@@ -223,16 -225,17 +225,17 @@@ static void daemon_request_connect_wait
        ctdb_daemon_connect_wait(client->ctdb);
  
        /* now send the reply */
 -      ZERO_STRUCT(r);
 -
 -      r.hdr.length     = sizeof(r);
 -      r.hdr.ctdb_magic = CTDB_MAGIC;
 -      r.hdr.ctdb_version = CTDB_VERSION;
 -      r.hdr.generation= client->ctdb->vnn_map->generation;
 -      r.hdr.operation = CTDB_REPLY_CONNECT_WAIT;
 -      r.vnn           = ctdb_get_vnn(client->ctdb);
 -      r.num_connected = client->ctdb->num_connected;
 +      r = ctdbd_allocate_pkt(client, sizeof(*r));
 +      r->hdr.length     = sizeof(*r);
 +      r->hdr.ctdb_magic = CTDB_MAGIC;
 +      r->hdr.ctdb_version = CTDB_VERSION;
++      r->hdr.generation= client->ctdb->vnn_map->generation;
 +      r->hdr.operation = CTDB_REPLY_CONNECT_WAIT;
 +      r->vnn           = ctdb_get_vnn(client->ctdb);
 +      r->num_connected = client->ctdb->num_connected;
        
 -      res = daemon_queue_send(client, &r.hdr);
 +      res = daemon_queue_send(client, &r->hdr);
 +      talloc_free(r);
        if (res != 0) {
                DEBUG(0,(__location__ " Failed to queue a connect wait response\n"));
                return;

diff --cc ctdb/include/ctdb_private.h
Simple merge