[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  149cae8 build: fix some indentation (tabs/vs spaces) in source3/wscript
       via  5231d70 build: fix waf checks for seteuid on non-Linux platforms
      from  8ee30be Add in the threaded async open engine.

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


- Log -----------------------------------------------------------------
commit 149cae84285b0e7076deaf993d381317fb2eadf5
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 11 15:54:29 2012 +0200

    build: fix some indentation (tabs/vs spaces) in source3/wscript
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Jul 11 19:37:12 CEST 2012 on sn-devel-104

commit 5231d70fe506d345152b12c4ed704b1de814891f
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 11 15:39:18 2012 +0200

    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.

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

Summary of changes:
 source3/wscript |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 12529e5..bd6ddcf 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,11 +774,8 @@ 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')):
-	        seteuid = conf.CHECK_CODE('''
+        if (conf.CONFIG_SET('USE_LINUX_32BIT_SYSCALLS')):
+            seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_LINUX_THREAD_CREDENTIALS 1
                                 #define USE_LINUX_32BIT_SYSCALLS 1
@@ -787,8 +786,8 @@ 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:
-	        seteuid = conf.CHECK_CODE('''
+        else:
+            seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_LINUX_THREAD_CREDENTIALS 1
                                 #include "../lib/util/setid.c"


-- 
Samba Shared Repository