From 6244f668a34279e6da62213333dfb32c3ccdb17d Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 18 Jun 2012 22:30:04 +0930 Subject: 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 --- lib/ldb/ldb_tdb/ldb_tdb_wrap.c | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'lib/ldb/ldb_tdb/ldb_tdb_wrap.c') diff --git a/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/lib/ldb/ldb_tdb/ldb_tdb_wrap.c index 3ddcba5cea..014a756d6e 100644 --- a/lib/ldb/ldb_tdb/ldb_tdb_wrap.c +++ b/lib/ldb/ldb_tdb/ldb_tdb_wrap.c @@ -24,32 +24,6 @@ #include "ldb_tdb.h" #include "dlinklist.h" -/* FIXME: TDB2 does this internally, so no need to wrap multiple opens! */ -#if BUILD_TDB2 -static void ltdb_log_fn(struct tdb_context *tdb, - enum tdb_log_level level, - enum TDB_ERROR ecode, - const char *message, - struct ldb_context *ldb) -{ - enum ldb_debug_level ldb_level; - const char *name = tdb_name(tdb); - - switch (level) { - case TDB_LOG_WARNING: - ldb_level = LDB_DEBUG_WARNING; - case TDB_LOG_USE_ERROR: - case TDB_LOG_ERROR: - ldb_level = LDB_DEBUG_FATAL; - break; - default: - ldb_level = LDB_DEBUG_FATAL; - } - - ldb_debug(ldb, ldb_level, "ltdb: tdb(%s): %s: %s", name, - tdb_errorstr(ecode), message); -} -#else /* !TDB2 */ static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4); static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) { @@ -86,7 +60,6 @@ static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, con ldb_debug(ldb, ldb_level, "ltdb: tdb(%s): %s", name, message); talloc_free(message); } -#endif /* the purpose of this code is to work around the braindead posix locking -- cgit