summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-06-19 12:43:10 +0930
committerRusty Russell <rusty@rustcorp.com.au>2012-06-19 05:38:07 +0200
commit2fc32658734d7196de5574c8cadeaea913e255e1 (patch)
treed3bacd2fc335a94f735af72735e8e16815376413
parent5ff92d8f7d15e42745e53fd40ffb8a765c9ea2d8 (diff)
downloadsamba-2fc32658734d7196de5574c8cadeaea913e255e1.tar.gz
samba-2fc32658734d7196de5574c8cadeaea913e255e1.tar.bz2
samba-2fc32658734d7196de5574c8cadeaea913e255e1.zip
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>
-rw-r--r--lib/util/util_tdb.c8
-rwxr-xr-xlib/util/wscript_build2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index 2db505cd99..41c9b50251 100644
--- 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 1cefe2d642..92221b9494 100755
--- 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
)