summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-06-18 22:30:04 +0930
committerRusty Russell <rusty@rustcorp.com.au>2012-06-19 05:38:05 +0200
commit6244f668a34279e6da62213333dfb32c3ccdb17d (patch)
tree0dd495f4d03e57e8a5710d2edea84c137d4b4aee /lib/util
parent5bad913938daca4ae3020653690701db83826954 (diff)
downloadsamba-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/util')
-rw-r--r--lib/util/util_tdb.c4
1 files changed, 0 insertions, 4 deletions
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;
}