[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  184e8e5 build: TDB_ERR_NESTING is used unconditionally
      from  6bf97ea Fix bug 8631 - POSIX ACE x permission becomes rx following mapping to and from a DACL Reported by David Disseldorp. Fix based on a patch by David.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 184e8e52182ce28d8a68c1a6904fdd7dad89ef4d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Nov 24 23:07:21 2011 +1100

    build: TDB_ERR_NESTING is used unconditionally
    
    Therefore, do not bother doing an autoconf test looking for it.
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Wed Nov 30 00:08:18 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |   10 ----------
 source3/wscript      |    5 -----
 2 files changed, 0 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 6091a4a..529b29b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2178,16 +2178,6 @@ 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/wscript b/source3/wscript
index c329cbf..2514048 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1358,11 +1358,6 @@ main() {
         msg="getcwd takes a NULL argument")
 
 
-    conf.CHECK_CODE('''enum TDB_ERROR err = TDB_ERR_NESTING''',
-		    'HAVE_TDB_ERR_NESTING',
-		    headers='tdb.h',
-		    msg='Checking whether we have TDB_ERR_NESTING')
-
     # UnixWare 7.x has its getspnam in -lgen
     conf.CHECK_FUNCS_IN('getspnam', 'gen')
     conf.CHECK_FUNCS_IN('getspnam', 'security')


-- 
Samba Shared Repository