[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Wed Feb 16 12:12:39 MST 2011


The branch, v3-6-test has been updated
       via  34b24e6 s3-waf: add check for __NR_inotify_init declaration.
       via  ee8c85a s3-waf: add check for various sysconf() variables.
       via  6eed406 s3-waf: add check for posix_fadvise().
       via  8bac04b s3-waf: add check for hires timestamps in struct stat.
       via  932f0a5 s3-waf: add check for "struct flock64".
       via  4a20c74 s3-waf: add check for broken (glibc2.1/x86) 64 bit fcntl locking.
       via  15faf9e s3-waf: add check for fcntl locking.
       via  8a4076a s3-waf: add check for "struct dirent64".
      from  518f1a2 s3-auth Fix memory leak in security=share and force user =

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 34b24e6e83c90fef9d459c2085d21543d2d3561d
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 18:38:19 2011 +0100

    s3-waf: add check for __NR_inotify_init declaration.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Feb 16 19:28:18 CET 2011 on sn-devel-104
    (cherry picked from commit 5d3f9569252cc329cd95b405768a93c4c19c4b4e)

commit ee8c85aa35a573fee4d459be8035e9f007aa48bc
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 18:29:33 2011 +0100

    s3-waf: add check for various sysconf() variables.
    
    Guenther
    (cherry picked from commit a029235b3e152988b6964c1cbdf2b20bbea9b55c)

commit 6eed4063e2704ec3c81be37c8a909df4019f1ee1
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 17:55:26 2011 +0100

    s3-waf: add check for posix_fadvise().
    
    Guenther
    (cherry picked from commit 9d78512b2bb85547f955552801d8770f92e0b2f5)

commit 8bac04b79db1f8fca8f041ccc6ee4ab755e0402c
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 17:33:05 2011 +0100

    s3-waf: add check for hires timestamps in struct stat.
    
    Guenther
    (cherry picked from commit 1cc0fb5a9aa9f7c90c27972b2c347fbcb3df5fe3)

commit 932f0a568c665635a2a92222ec1796b11fea2f17
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 17:03:24 2011 +0100

    s3-waf: add check for "struct flock64".
    
    Guenther
    (cherry picked from commit 3b3f13a7fb6816563ae1334e821ea37f9175b16e)

commit 4a20c74b5a7a1869be0120233749cb12eb0bfd10
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 16:52:45 2011 +0100

    s3-waf: add check for broken (glibc2.1/x86) 64 bit fcntl locking.
    
    Guenther
    (cherry picked from commit 8701b0d6454f846472a186f1e44dd4a9368631f4)

commit 15faf9e1f80c46e482b5c68a08cae67a7246e7fc
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 16:51:14 2011 +0100

    s3-waf: add check for fcntl locking.
    
    Guenther
    (cherry picked from commit 4e32fd9d5cb9360fb32f765ba7018a8f609e287f)

commit 8a4076afa84f13c29b42b0f9b8416243e1525ceb
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 16 16:42:33 2011 +0100

    s3-waf: add check for "struct dirent64".
    
    Guenther
    (cherry picked from commit b3f76482d250511ddf3b75f276c48c51db939691)

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

Summary of changes:
 source3/wscript |   85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 85 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 78aad61..df82cc6 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1001,6 +1001,91 @@ int i; i = PAM_RADIO_TYPE;
 ''',
 		'HAVE_LINUX_RTNETLINK_H',
 		msg='Checking whether Linux rtnetlink is available')
+    if conf.CHECK_TYPE('struct dirent64', headers='sys/types.h dirent.h') and conf.CONFIG_SET('HAVE_READDIR64'):
+        conf.DEFINE('HAVE_STRUCT_DIRENT64', '1')
+    else:
+        conf.undefine('HAVE_STRUCT_DIRENT64')
+
+    conf.CHECK_CODE('''
+#include "../tests/fcntl_lock.c"
+''',
+		'HAVE_FCNTL_LOCK',
+		addmain=False,
+		execute=True,
+		msg='Checking whether fcntl locking is available')
+
+    conf.CHECK_CODE('''
+#include "../tests/fcntl_lock64.c"
+''',
+		'HAVE_BROKEN_FCNTL64_LOCKS',
+		addmain=False,
+		execute=True,
+		msg='Checking whether fcntl64 locks are broken')
+
+    if not conf.CONFIG_SET('HAVE_BROKEN_FCNTL64_LOCKS'):
+        conf.CHECK_CODE('''
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_SYS_FCNTL_H
+#include <sys/fcntl.h>
+#endif
+main() { struct flock64 fl64;
+#if defined(F_SETLKW64) && defined(F_SETLK64) && defined(F_GETLK64)
+exit(0);
+#else
+exit(1);
+#endif
+}
+''',
+		'HAVE_STRUCT_FLOCK64',
+		addmain=False,
+		execute=True,
+		msg="Checking whether the flock64 struct is available")
+
+    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec',
+				define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris
+    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimensec',
+				define='HAVE_STRUCT_STAT_ST_MTIMENSEC') # BSD, if defined _POSIX_SOURCE
+    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimespec.tv_nsec',
+				define='HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC') # BSD, if not defined _POSIX_SOURCE
+    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtime_n',
+				define='HAVE_STRUCT_STAT_ST_MTIME_N') # AIX
+    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_umtime',
+				define='HAVE_STRUCT_STAT_ST_UMTIME') # Tru64
+    if conf.CONFIG_SET('HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') or \
+       conf.CONFIG_SET('HAVE_STRUCT_STAT_ST_MTIMENSEC') or \
+       conf.CONFIG_SET('HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC') or \
+       conf.CONFIG_SET('HAVE_STRUCT_STAT_ST_MTIME_N') or \
+       conf.CONFIG_SET('HAVE_STRUCT_STAT_ST_UMTIME'):
+        conf.DEFINE('HAVE_STAT_HIRES_TIMESTAMPS', '1')
+
+    conf.CHECK_CODE('''
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+#include <fcntl.h>],
+ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
+''',
+		'HAVE_POSIX_FADVISE',
+		msg='Checking whether posix_fadvise is available')
+
+    for v in ['_SC_NGROUPS_MAX', '_SC_NPROC_ONLN', '_SC_NPROCESSORS_ONLN', '_SC_PAGESIZE' ]:
+        conf.CHECK_CODE('''
+			#include <unistd.h>
+			return sysconf(%s) == -1 ? 1 : 0;
+			''' % v,
+			'SYSCONF%s' % v,
+			msg='Checking whether sysconf(%s) is available' % v)
+
+    conf.CHECK_DECLS('__NR_inotify_init', reverse=True, headers='asm/unistd.h')
 
     default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
                                       auth_sam auth_unix auth_winbind auth_wbc auth_server


-- 
Samba Shared Repository


More information about the samba-cvs mailing list