From 809c0258780cc75cd456518571891fc30998d30d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 18 Jun 2001 20:27:35 +0000 Subject: Added patches to remove Linux specific XFS ACLs. These are now handled by the generic Linux ACL code. rpc_server/srv_samr_nt.c: Don't delete a policy handle before it's created. Jeremy. (This used to be commit db5b82e53a7061c4764d39ceb3df82e706aad42f) --- source3/configure | 43 ++++--------------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) (limited to 'source3/configure') diff --git a/source3/configure b/source3/configure index ab8868fd8f..78546d9da0 100755 --- a/source3/configure +++ b/source3/configure @@ -2852,7 +2852,7 @@ else fi done -for ac_hdr in sys/acl.h sys/cdefs.h glob.h acl/acl.h +for ac_hdr in sys/acl.h sys/cdefs.h glob.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -12619,41 +12619,6 @@ EOF fi fi - echo $ac_n "checking for XFS ACL support""... $ac_c" 1>&6 -echo "configure:12624: checking for XFS ACL support" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_XFS_ACLS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -#include -int main() { - char test_str[13] = SGI_ACL_FILE; -; return 0; } -EOF -if { (eval echo configure:12638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - samba_cv_HAVE_XFS_ACLS=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - samba_cv_XFS_POSIX_ACLS=no -fi -rm -f conftest* -fi - -echo "$ac_t""$samba_cv_HAVE_XFS_ACLS" 1>&6 - if test x"$samba_cv_HAVE_XFS_ACLS" = x"yes"; then - echo "$ac_t""Using XFS ACLs" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_XFS_ACLS 1 -EOF - - fi ;; esac ;; @@ -12679,7 +12644,7 @@ fi # check whether winbind is supported on this platform echo $ac_n "checking whether to compile winbind""... $ac_c" 1>&6 -echo "configure:12683: checking whether to compile winbind" >&5 +echo "configure:12648: checking whether to compile winbind" >&5 case "$host_os" in *linux*|*solaris*) @@ -12719,11 +12684,11 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "configure OK"; else -- cgit