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.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lib/ldb/ldb_tdb/ldb_tdb.c') diff --git a/lib/ldb/ldb_tdb/ldb_tdb.c b/lib/ldb/ldb_tdb/ldb_tdb.c index 5324c9b76f..3541f9109f 100644 --- a/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/lib/ldb/ldb_tdb/ldb_tdb.c @@ -74,13 +74,9 @@ int ltdb_err_map(enum TDB_ERROR tdb_code) case TDB_ERR_IO: return LDB_ERR_PROTOCOL_ERROR; case TDB_ERR_LOCK: -#ifndef BUILD_TDB2 case TDB_ERR_NOLOCK: -#endif return LDB_ERR_BUSY; -#ifndef BUILD_TDB2 case TDB_ERR_LOCK_TIMEOUT: -#endif return LDB_ERR_TIME_LIMIT_EXCEEDED; case TDB_ERR_EXISTS: return LDB_ERR_ENTRY_ALREADY_EXISTS; -- cgit