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/util/util_tdb.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lib/util') diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c index 2096769e57..2db505cd99 100644 --- a/lib/util/util_tdb.c +++ b/lib/util/util_tdb.c @@ -388,7 +388,6 @@ NTSTATUS map_nt_error_from_tdb(enum TDB_ERROR err) result = NT_STATUS_FILE_LOCK_CONFLICT; break; -#ifndef BUILD_TDB2 case TDB_ERR_NOLOCK: case TDB_ERR_LOCK_TIMEOUT: /* @@ -396,7 +395,6 @@ NTSTATUS map_nt_error_from_tdb(enum TDB_ERROR err) */ result = NT_STATUS_FILE_LOCK_CONFLICT; break; -#endif case TDB_ERR_NOEXIST: result = NT_STATUS_NOT_FOUND; break; @@ -406,11 +404,9 @@ NTSTATUS map_nt_error_from_tdb(enum TDB_ERROR err) case TDB_ERR_RDONLY: result = NT_STATUS_ACCESS_DENIED; break; -#ifndef BUILD_TDB2 case TDB_ERR_NESTING: result = NT_STATUS_INTERNAL_ERROR; break; -#endif }; return result; } -- cgit