[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Mon Jan 31 02:52:02 MST 2011


The branch, master has been updated
       via  35a7beb s3-waf: On FreeBSD, compile zfsacl if sunacl.h is around.
       via  c9cb42a nsswitch: libwbclient has vnum 1 now.
       via  eb5d884 s3-waf: these libs are not private libs.
      from  7b9ead1 s4:auth/pyauth.c - temporarily add compatibility code for Python 2.4

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


- Log -----------------------------------------------------------------
commit 35a7bebe2bc2c26ad2ee0a2ef9ce4217ca42e0ef
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jan 31 09:38:21 2011 +0100

    s3-waf: On FreeBSD, compile zfsacl if sunacl.h is around.
    
    Volker, please check.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Jan 31 10:51:10 CET 2011 on sn-devel-104

commit c9cb42a27634a0a711d48762c779c6b2f7c338e2
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 28 18:33:41 2011 +0100

    nsswitch: libwbclient has vnum 1 now.
    
    Michael, please check.
    
    Guenther

commit eb5d884b15b7d36559ab5961167a0277e93086e7
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 28 18:31:41 2011 +0100

    s3-waf: these libs are not private libs.
    
    Guenther

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

Summary of changes:
 nsswitch/libwbclient/wscript_build |    2 +-
 source3/modules/wscript_build      |    2 +-
 source3/wscript                    |    9 +++++++++
 source3/wscript_build              |    6 +++---
 4 files changed, 14 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
index 896e17d..9fffa94 100644
--- a/nsswitch/libwbclient/wscript_build
+++ b/nsswitch/libwbclient/wscript_build
@@ -4,5 +4,5 @@ bld.SAMBA_LIBRARY('wbclient',
 	source='wbc_guid.c wbc_idmap.c wbclient.c wbc_pam.c wbc_pwd.c wbc_sid.c wbc_util.c',
 	deps='winbind-client',
 	public_headers='wbclient.h',
-	private_library=True
+	vnum='1'
 	)
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 32dfa40..29d4d8f 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -204,7 +204,7 @@ bld.SAMBA_MODULE('vfs_solarisacl',
 bld.SAMBA_MODULE('vfs_zfsacl',
                  subsystem='vfs',
                  source=VFS_ZFSACL_SRC,
-                 deps='NFS4_ACLS',
+                 deps='NFS4_ACLS sunacl',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'))
diff --git a/source3/wscript b/source3/wscript
index e286e8f..89ee79f 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -285,6 +285,8 @@ utimensat vsyslog _write __write __xstat
     # Python doesn't have case switches... :/
     # FIXME: original was *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
     # the search for .rfind('gnu') covers gnu* and *-gnu is that too broad?
+
+    conf.SET_TARGET_TYPE('sunacl', 'EMPTY')
     if (host_os.rfind('linux') > -1) or (host_os.rfind('gnu') > -1) or (host_os.rfind('qnx') > -1):
         if host_os.rfind('linux') > -1:
             conf.DEFINE('LINUX', '1')
@@ -295,6 +297,10 @@ utimensat vsyslog _write __write __xstat
         conf.DEFINE('DARWINOS', 1)
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
         conf.ADD_CFLAGS('-fno-common')
+    elif (host_os.rfind('freebsd') > -1):
+        if conf.CHECK_HEADERS('sunacl.h'):
+            conf.define('HAVE_FREEBSD_SUNACL_H', '1')
+            conf.CHECK_FUNCS_IN('acl', 'sunacl')
     # FIXME: Add more checks here.
     else:
         print "Unknown host_os '%s', please report this to samba-technical at samba.org" % host_os
@@ -418,6 +424,9 @@ return acl_get_perm_np(permset_d, perm);
     if Options.options.with_acl_support and conf.CONFIG_SET('HAVE_POSIX_ACLS'):
         default_static_modules.extend(TO_LIST('vfs_posixacl'))
 
+    if conf.CONFIG_SET('HAVE_FREEBSD_SUNACL_H'):
+	default_shared_modules.extend(TO_LIST('vfs_zfsacl'))
+
     if conf.CONFIG_SET('HAVE_DIRFD_DECL'):
 	default_shared_modules.extend(TO_LIST('vfs_syncops vfs_dirsort'))
 
diff --git a/source3/wscript_build b/source3/wscript_build
index 3e5876c..6000069 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -707,7 +707,7 @@ bld.SAMBA_LIBRARY('netapi',
                     RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
                     INIT_NETLOGON INIT_SAMR''',
                     public_headers='lib/netapi/netapi.h',
-                    private_library=True,
+                    vnum='0',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('smbclient',
@@ -715,14 +715,14 @@ bld.SAMBA_LIBRARY('smbclient',
                     public_deps='''talloc tdb wbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB
                     LIBMSRPC_GEN LIBMSRPC LIBCLI_LSA RPC_NDR_SRVSVC''',
                     public_headers='include/libsmbclient.h',
-                    private_library=True,
+                    vnum='0',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('smbsharemodes',
                     source=LIBSMBSHAREMODES_SRC,
                     public_deps='''talloc tdb''',
                     public_headers='include/smb_share_modes.h',
-                    private_library=True,
+                    vnum='0',
                     vars=locals())
 
 bld.SAMBA_LIBRARY('nss_winbind',


-- 
Samba Shared Repository


More information about the samba-cvs mailing list