diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-18 22:30:04 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 05:38:05 +0200 |
| commit | 6244f668a34279e6da62213333dfb32c3ccdb17d (patch) | |
| tree | 0dd495f4d03e57e8a5710d2edea84c137d4b4aee /lib/tdb_wrap | |
| parent | 5bad913938daca4ae3020653690701db83826954 (diff) | |
| download | samba-6244f668a34279e6da62213333dfb32c3ccdb17d.tar.gz samba-6244f668a34279e6da62213333dfb32c3ccdb17d.tar.bz2 samba-6244f668a34279e6da62213333dfb32c3ccdb17d.zip | |
TDB2: make SAMBA use tdb1 again for the moment.
Otherwise the following surgery will break the SAMBA build and testsuite.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb_wrap')
| -rw-r--r-- | lib/tdb_wrap/tdb_wrap.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/lib/tdb_wrap/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c index 0994b1b79c..1540aa9033 100644 --- a/lib/tdb_wrap/tdb_wrap.c +++ b/lib/tdb_wrap/tdb_wrap.c @@ -24,33 +24,6 @@ #include "lib/tdb_wrap/tdb_wrap.h" #include "lib/param/param.h" -/* FIXME: TDB2 does this internally, so no need to wrap multiple opens! */ -#if BUILD_TDB2 -static void tdb_wrap_log(struct tdb_context *tdb, - enum tdb_log_level level, - enum TDB_ERROR ecode, - const char *message, - void *unused) -{ - int dl; - const char *name = tdb_name(tdb); - - switch (level) { - case TDB_LOG_USE_ERROR: - case TDB_LOG_ERROR: - dl = 0; - break; - case TDB_LOG_WARNING: - dl = 2; - break; - default: - dl = 0; - } - - DEBUG(dl, ("tdb(%s):%s: %s", name ? name : "unnamed", - tdb_errorstr(ecode), message)); -} -#else /* Log tdb messages via DEBUG(). */ @@ -92,7 +65,6 @@ static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, free(ptr); } } -#endif struct tdb_wrap_private { struct tdb_context *tdb; |