The branch, master has been updated via 53744f0... s3: Cope with older external libtdb via ecb071c... Revert "s3-build: taise tdb version when building against system libtdb library." from 8dda4ce... Ensure we don't see the xattr used to store NT security (visible when xattr_tdb is used). Allows make test to pass with acl_xattr.so prepended to the vfs modules. Jeremy.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 53744f01dc7f74f87e4c71057cc175e4c47d3a67 Author: Volker Lendecke <v...@samba.org> Date: Tue Dec 1 00:01:36 2009 +0100 s3: Cope with older external libtdb commit ecb071ca2a00d1b35ace2a4f8924f2af2ba34328 Author: Günther Deschner <g...@samba.org> Date: Wed Dec 2 00:22:18 2009 +0100 Revert "s3-build: taise tdb version when building against system libtdb library." This reverts commit ea20678c55fee9f4586630cdb5fe7f35457d309a. Just one new error code does probably not justify raising the required tdb version. Guenther ----------------------------------------------------------------------- Summary of changes: source3/configure.in | 12 +++++++++++- source3/lib/ldb/ldb_tdb/ldb_tdb.c | 2 ++ 2 files changed, 13 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index fc62fc2..de30f14 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1973,7 +1973,7 @@ AC_ARG_ENABLE(external_libtdb, if test "x$enable_external_libtdb" != xno then - PKG_CHECK_MODULES(LIBTDB, tdb >= 1.2.0, + PKG_CHECK_MODULES(LIBTDB, tdb >= 1.1.4, [ enable_external_libtdb=yes ], [ if test x$enable_external_libtdb = xyes; then @@ -2006,6 +2006,16 @@ then AC_SUBST(TDBTOOL) TDBTORTURE="bin/tdbtorture\$(EXEEXT)" AC_SUBST(TDBTORTURE) + ac_cv_have_tdb_err_nesting=yes +else + AC_TRY_COMPILE([#include "tdb.h"], + [enum TDB_ERROR err = TDB_ERR_NESTING], + ac_cv_have_tdb_err_nesting=yes, + ac_cv_have_tdb_err_nesting=no) +fi + +if test x"$ac_cv_have_tdb_err_nesting" = xyes; then + AC_DEFINE(HAVE_TDB_ERR_NESTING, 1, [Whether we have TDB_ERR_NESTING]) fi SMB_LIBRARY(netapi, 0) diff --git a/source3/lib/ldb/ldb_tdb/ldb_tdb.c b/source3/lib/ldb/ldb_tdb/ldb_tdb.c index 6bebb6d..e3bc069 100644 --- a/source3/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source3/lib/ldb/ldb_tdb/ldb_tdb.c @@ -59,7 +59,9 @@ static int ltdb_err_map(enum TDB_ERROR tdb_code) case TDB_ERR_CORRUPT: case TDB_ERR_OOM: case TDB_ERR_EINVAL: +#if HAVE_TDB_ERR_NESTING case TDB_ERR_NESTING: +#endif return LDB_ERR_OPERATIONS_ERROR; case TDB_ERR_IO: return LDB_ERR_PROTOCOL_ERROR; -- Samba Shared Repository