[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Sun Jul 1 19:03:02 MDT 2012


The branch, master has been updated
       via  3f30b02 Disable selections of USE_LINUX_THREAD_CREDENTIALS until we have specific 32-bit and 64-bit versions.
      from  8150f69 ccan: make it a grouping library.

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


- Log -----------------------------------------------------------------
commit 3f30b02b65543398b79736ea09745a04e3a36bca
Author: Jeremy Allison <jra at samba.org>
Date:   Sun Jul 1 15:32:44 2012 -0700

    Disable selections of USE_LINUX_THREAD_CREDENTIALS until we have specific
    32-bit and 64-bit versions.
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Jul  2 03:02:47 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/configure.in |   36 ++++++++++++++++++++----------------
 source3/wscript      |   26 +++++++++++++++-----------
 2 files changed, 35 insertions(+), 27 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index e55114d..4def9cd 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2766,22 +2766,26 @@ AC_CHECK_FUNCS(getpagesize)
 # look for a method of setting the effective uid
 seteuid=no;
 
-case "$host_os" in
-*linux*)
-if test $seteuid = no; then
-AC_CACHE_CHECK([for Linux thread-specific credentials],samba_cv_USE_LINUX_THREAD_CREDENTIALS,[
-AC_TRY_RUN([
-#define AUTOCONF_TEST 1
-#define USE_LINUX_THREAD_CREDENTIALS 1
-#include "${srcdir-.}/../lib/util/setid.c"
-#include "${srcdir-.}/lib/util_sec.c"],
-           samba_cv_USE_LINUX_THREAD_CREDENTIALS=yes,samba_cv_USE_LINUX_THREAD_CREDENTIALS=no,samba_cv_USE_LINUX_THREAD_CREDENTIALS=cross)])
-if test x"$samba_cv_USE_LINUX_THREAD_CREDENTIALS" = x"yes"; then
-    seteuid=yes;AC_DEFINE(USE_LINUX_THREAD_CREDENTIALS,1,[Whether we can use Linux thread-specific credentials])
-fi
-fi
-;;
-esac
+#
+# Disable for now until Linux-64 and Linux-32 specific versions
+# are separated out.
+#
+#case "$host_os" in
+#*linux*)
+#if test $seteuid = no; then
+#AC_CACHE_CHECK([for Linux thread-specific credentials],samba_cv_USE_LINUX_THREAD_CREDENTIALS,[
+#AC_TRY_RUN([
+##define AUTOCONF_TEST 1
+##define USE_LINUX_THREAD_CREDENTIALS 1
+##include "${srcdir-.}/../lib/util/setid.c"
+##include "${srcdir-.}/lib/util_sec.c"],
+#           samba_cv_USE_LINUX_THREAD_CREDENTIALS=yes,samba_cv_USE_LINUX_THREAD_CREDENTIALS=no,samba_cv_USE_LINUX_THREAD_CREDENTIALS=cross)])
+#if test x"$samba_cv_USE_LINUX_THREAD_CREDENTIALS" = x"yes"; then
+#    seteuid=yes;AC_DEFINE(USE_LINUX_THREAD_CREDENTIALS,1,[Whether we can use Linux thread-specific credentials])
+#fi
+#fi
+#;;
+#esac
 
 if test $seteuid = no; then
 AC_CACHE_CHECK([for setreuid],samba_cv_USE_SETREUID,[
diff --git a/source3/wscript b/source3/wscript
index 8f2453f..e372fcc 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -729,17 +729,21 @@ int i; i = PAM_RADIO_TYPE;
             conf.DEFINE('WITH_PAM_MODULES', 1)
 
     seteuid = False
-    if not seteuid:
-        seteuid = conf.CHECK_CODE('''
-                                #define AUTOCONF_TEST 1
-                                #define USE_LINUX_THREAD_CREDENTIALS 1
-                                #include "../lib/util/setid.c"
-                                #include "./lib/util_sec.c"
-                                ''',
-                                'USE_LINUX_THREAD_CREDENTIALS',
-                                addmain=False,
-                                execute=True,
-                                msg="Checking whether we can use Linux thread-specific credentials")
+#
+# Disable for now until Linux-64 and Linux-32 specific versions
+# are separated out.
+#
+#    if not seteuid:
+#        seteuid = conf.CHECK_CODE('''
+#                                #define AUTOCONF_TEST 1
+#                                #define USE_LINUX_THREAD_CREDENTIALS 1
+#                                #include "../lib/util/setid.c"
+#                                #include "./lib/util_sec.c"
+#                                ''',
+#                                'USE_LINUX_THREAD_CREDENTIALS',
+#                                addmain=False,
+#                                execute=True,
+#                                msg="Checking whether we can use Linux thread-specific credentials")
     if not seteuid:
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1


-- 
Samba Shared Repository


More information about the samba-cvs mailing list