From 5231d70fe506d345152b12c4ed704b1de814891f Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 11 Jul 2012 15:39:18 +0200 Subject: build: fix waf checks for seteuid on non-Linux platforms An indentation error had linux-specific checks called on non-linux with the effect that "#define USE_LINUX_THREAD_CREDENTIALS 1" was effective. --- source3/wscript | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source3/wscript b/source3/wscript index 12529e5e69..f28cad128b 100755 --- a/source3/wscript +++ b/source3/wscript @@ -733,6 +733,8 @@ int i; i = PAM_RADIO_TYPE; conf.DEFINE('WITH_PAM', 1) conf.DEFINE('WITH_PAM_MODULES', 1) + seteuid = False + # # Ensure we select the correct set of system calls on Linux. # @@ -772,10 +774,7 @@ syscall(SYS_setgroups32, 0, NULL); 'USE_LINUX_32BIT_SYSCALLS', msg="Checking whether Linux should use 32-bit credential calls"); - seteuid = False - - if not seteuid: - if (conf.CONFIG_SET('USE_LINUX_32BIT_SYSCALLS')): + if (conf.CONFIG_SET('USE_LINUX_32BIT_SYSCALLS')): seteuid = conf.CHECK_CODE(''' #define AUTOCONF_TEST 1 #define USE_LINUX_THREAD_CREDENTIALS 1 @@ -787,7 +786,7 @@ syscall(SYS_setgroups32, 0, NULL); addmain=False, execute=True, msg="Checking whether we can use Linux thread-specific credentials with 32-bit system calls") - else: + else: seteuid = conf.CHECK_CODE(''' #define AUTOCONF_TEST 1 #define USE_LINUX_THREAD_CREDENTIALS 1 -- cgit