From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 21 Apr 2007 08:09:37 +0000 (+0200)
Subject: merge from samba4
X-Git-Tag: tevent-0.9.20~348^2~2856
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=531f8237eb23cc3da1b31badfbbda04f76558ccf;p=thirdparty%2Fsamba.git

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 1691689e10c..bf84eeee19a 100755
--- 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 9d39de02003..02a23d0387e 100644
--- 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);