merge from ab

(This used to be ctdb commit 5074b6e84704e213f733cebc92c62ca135f03cd6)

diff --cc ctdb/Makefile.in
Simple merge

diff --cc ctdb/common/ctdb_ltdb.c
index 881cf48630b38893a1c18198a1a72f560a9f1cf6,895814000254207d1604fc49839649e8b5c4b155..38f2d03d4fda4134e370d4a389da8956292f5495
--- 1/ctdb/common/ctdb_ltdb.c
--- 2/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@@ -78,7 -78,8 +78,8 @@@ int ctdb_ltdb_fetch(struct ctdb_contex
        rec = tdb_fetch(ctdb->ltdb, key);
        if (rec.dsize < sizeof(*header)) {
                /* return an initial header */
++              free(rec.dptr);
                ltdb_initial_header(ctdb, key, header);
 -              SAFE_FREE(rec.dptr);
                data->dptr = NULL;
                data->dsize = 0;
                return 0;
@@@ -89,6 -90,7 +90,7 @@@
        data->dsize = rec.dsize - sizeof(struct ctdb_ltdb_header);
        data->dptr = talloc_memdup(ctdb, sizeof(struct ctdb_ltdb_header)+rec.dptr,
                                   data->dsize);
 -      SAFE_FREE(rec.dptr);
++      free(rec.dptr);
        CTDB_NO_MEMORY(ctdb, data->dptr);
  
        return 0;