[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  3a07fe5 s3-waf: finally make SO_PEERCRED configure check work with stricter CFLAGS.
      from  e952c69 s3: Trim lines in nfs4_acls.c

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


- Log -----------------------------------------------------------------
commit 3a07fe5b36353d01eb87694fa722d7d2113ee197
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 16 12:35:58 2011 +0200

    s3-waf: finally make SO_PEERCRED configure check work with stricter CFLAGS.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Sep 16 14:14:48 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/wscript |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 1b7f0e7..1f4e7c3 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -442,13 +442,12 @@ return acl_get_perm_np(permset_d, perm);
     conf.CHECK_DECLS('readahead', headers='fcntl.h', always=True)
 
     conf.CHECK_CODE('''
-		#include <sys/types.h>
-		#include <sys/socket.h>
 		struct ucred cred;
 		socklen_t cred_len;
 		int ret = getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len);''',
 		'HAVE_PEERCRED',
-		msg="Checking whether we can use SO_PEERCRED to get socket credentials")
+		msg="Checking whether we can use SO_PEERCRED to get socket credentials",
+		headers='sys/types.h sys/socket.h')
 
     conf.CHECK_CODE('''
 		#if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))


-- 
Samba Shared Repository