summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-07-01 15:32:44 -0700
committerJeremy Allison <jra@samba.org>2012-07-02 03:02:47 +0200
commit3f30b02b65543398b79736ea09745a04e3a36bca (patch)
tree455a68cfdaa489ae9cb8b295daa1ff93796a1474 /source3
parent8150f69dc4cf73adb6f7aebd6f06074502dfcd05 (diff)
downloadsamba-3f30b02b65543398b79736ea09745a04e3a36bca.tar.gz
samba-3f30b02b65543398b79736ea09745a04e3a36bca.tar.bz2
samba-3f30b02b65543398b79736ea09745a04e3a36bca.zip
Disable selections of USE_LINUX_THREAD_CREDENTIALS until we have specific
32-bit and 64-bit versions. Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Mon Jul 2 03:02:47 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in36
-rwxr-xr-xsource3/wscript26
2 files changed, 35 insertions, 27 deletions
diff --git a/source3/configure.in b/source3/configure.in
index e55114de15..4def9cd80a 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 8f2453f2e6..e372fcc5ae 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