merge from samba4

(This used to be ctdb commit a64c6ace26559b2793f2a804430fb0fc53f03a34)

diff --git a/ctdb/lib/tdb/autogen.sh b/ctdb/lib/tdb/autogen.sh
index 1691689e10c9f3b5889a50f6939dfdcd0d51ba59..bf84eeee19a9116f3dc79177449a91321b3e8c31 100755 (executable)
--- a/ctdb/lib/tdb/autogen.sh
+++ b/ctdb/lib/tdb/autogen.sh
@@ -3,7 +3,7 @@
 rm -rf autom4te.cache
 rm -f configure config.h.in
 
-IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace -I ../lib/replace"
+IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
 autoconf $IPATHS || exit 1
 autoheader $IPATHS || exit 1
 

diff --git a/ctdb/lib/tdb/common/tdb_private.h b/ctdb/lib/tdb/common/tdb_private.h
index 9d39de020031a4d432ab05f30202653473d55ef1..02a23d0387e3ccac1d9a6eea87450e52a53374ef 100644 (file)
--- a/ctdb/lib/tdb/common/tdb_private.h
+++ b/ctdb/lib/tdb/common/tdb_private.h
@@ -206,7 +206,7 @@ tdb_off_t tdb_find_lock_hash(struct tdb_context *tdb, TDB_DATA key, u32 hash, in
                           struct list_struct *rec);
 void tdb_io_init(struct tdb_context *tdb);
 int tdb_expand(struct tdb_context *tdb, tdb_off_t size);
-int rec_free_read(struct tdb_context *tdb, tdb_off_t off,
-                 struct list_struct *rec);
+int tdb_rec_free_read(struct tdb_context *tdb, tdb_off_t off,
+                     struct list_struct *rec);