lib/util_tdb: depend directly on tdb, not tdb_compat.

Simple change, as we get rid of tdb_compat in favour of tdb directly.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index 2db505cd994a5c9878bab9caa3b83422ca8873bc..41c9b50251c31d47b62ecc154c1222c1fe0fab30 100644 (file)
--- a/lib/util/util_tdb.c
+++ b/lib/util/util_tdb.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "../lib/tdb_compat/tdb_compat.h"
+#include "../lib/tdb/include/tdb.h"
 #include "../lib/util/util_tdb.h"
 
 /* these are little tdb utility functions that are meant to make
@@ -117,7 +117,7 @@ int32_t tdb_fetch_int32_byblob(struct tdb_context *tdb, TDB_DATA key)
        TDB_DATA data;
        int32_t ret;
 
-       data = tdb_fetch_compat(tdb, key);
+       data = tdb_fetch(tdb, key);
        if (!data.dptr || data.dsize != sizeof(int32_t)) {
                SAFE_FREE(data.dptr);
                return -1;
@@ -174,7 +174,7 @@ bool tdb_fetch_uint32_byblob(struct tdb_context *tdb, TDB_DATA key, uint32_t *va
 {
        TDB_DATA data;
 
-       data = tdb_fetch_compat(tdb, key);
+       data = tdb_fetch(tdb, key);
        if (!data.dptr || data.dsize != sizeof(uint32_t)) {
                SAFE_FREE(data.dptr);
                return false;
@@ -246,7 +246,7 @@ TDB_DATA tdb_fetch_bystring(struct tdb_context *tdb, const char *keystr)
 {
        TDB_DATA key = string_term_tdb_data(keystr);
 
-       return tdb_fetch_compat(tdb, key);
+       return tdb_fetch(tdb, key);
 }
 
 /****************************************************************************

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 1cefe2d642ae0f43d4eeea1dcf8ae12083964d20..92221b9494762b547748da246c10d8f98c7b8a73 100755 (executable)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -41,7 +41,7 @@ bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
 bld.SAMBA_LIBRARY('util_tdb',
        source='util_tdb.c',
        local_include=False,
-       public_deps='tdb_compat talloc',
+       public_deps='tdb talloc',
        private_library=True
        )