diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 12:43:10 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 05:38:07 +0200 |
| commit | 316e5e376c793d1f9882eebddbbd855cf121cce4 (patch) | |
| tree | 239d4fb35bc72910b2e02c97438f639812ab697c /lib/tdb_wrap | |
| parent | df4a6e82280845668dee6fe10f2025c9fa2b958c (diff) | |
| download | samba-316e5e376c793d1f9882eebddbbd855cf121cce4.tar.gz | |
lib/tdb_wrap: use tdb directly, not tdb_compat.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb_wrap')
| -rw-r--r-- | lib/tdb_wrap/tdb_wrap.c | 6 | ||||
| -rw-r--r-- | lib/tdb_wrap/tdb_wrap.h | 2 | ||||
| -rw-r--r-- | lib/tdb_wrap/wscript_build | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/tdb_wrap/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c index 1540aa90332..b96469d7350 100644 --- a/lib/tdb_wrap/tdb_wrap.c +++ b/lib/tdb_wrap/tdb_wrap.c @@ -91,6 +91,7 @@ static struct tdb_wrap_private *tdb_wrap_private_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { struct tdb_wrap_private *result; + struct tdb_logging_context lctx; result = talloc(mem_ctx, struct tdb_wrap_private); if (result == NULL) { @@ -117,8 +118,9 @@ static struct tdb_wrap_private *tdb_wrap_private_open(TALLOC_CTX *mem_ctx, hash_size = lpcfg_parm_int(lp_ctx, NULL, "tdb_hashsize", base, 0); } - result->tdb = tdb_open_compat(name, hash_size, tdb_flags, - open_flags, mode, tdb_wrap_log, NULL); + lctx.log_fn = tdb_wrap_log; + result->tdb = tdb_open_ex(name, hash_size, tdb_flags, + open_flags, mode, &lctx, NULL); if (result->tdb == NULL) { goto fail; } diff --git a/lib/tdb_wrap/tdb_wrap.h b/lib/tdb_wrap/tdb_wrap.h index 81e77e76a45..3e1fb83734b 100644 --- a/lib/tdb_wrap/tdb_wrap.h +++ b/lib/tdb_wrap/tdb_wrap.h @@ -29,7 +29,7 @@ #ifndef _TDB_WRAP_H_ #define _TDB_WRAP_H_ -#include "tdb_compat.h" +#include "tdb.h" struct tdb_wrap { struct tdb_context *tdb; diff --git a/lib/tdb_wrap/wscript_build b/lib/tdb_wrap/wscript_build index 0811bc5a2db..0e5532fbc3a 100644 --- a/lib/tdb_wrap/wscript_build +++ b/lib/tdb_wrap/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_LIBRARY('tdb-wrap', source='tdb_wrap.c', - deps='tdb_compat talloc samba-util samba-hostconfig', + deps='tdb talloc samba-util samba-hostconfig', private_library=True, local_include=False ) |