[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  7138b21 build: Add #define FREEBSD on FreeBSD
       via  6d73fd0 lib/replace: Fix configure on FreeBSD: define_ret is not correct here
       via  80f42df lib/replace: Fix detection of prctl
       via  debb2b2 lib/replace: Fix detection of rpcsrv/yp_prot.h on FreeBSD
       via  60a06ff vfs: Fix compilation of ACL support on solaris
      from  bd099c4 waf: Create a libnss_wins.so symlink.

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


- Log -----------------------------------------------------------------
commit 7138b2138ba1f67386c6aa1e1c5ef49fde07cc41
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Oct 23 17:53:58 2012 +1100

    build: Add #define FREEBSD on FreeBSD
    
    This makes waf match autoconf
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Oct 23 11:11:44 CEST 2012 on sn-devel-104

commit 6d73fd07f94ae23f3eacaab3b220ffca201b1300
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Oct 23 17:31:03 2012 +1100

    lib/replace: Fix configure on FreeBSD: define_ret is not correct here
    
    define_ret is for when the output of the compiled and run program
    should be put into the configure define.  This is not the case
    here.
    
    Andrew Bartlett

commit 80f42df4ec9194ff00aeeb3c2cf6acfa1f2ab5c3
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Oct 23 17:14:55 2012 +1100

    lib/replace: Fix detection of prctl

commit debb2b2b9e9a495b0f9f31753ac5e75e4b2d5364
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Oct 23 17:14:43 2012 +1100

    lib/replace: Fix detection of rpcsrv/yp_prot.h on FreeBSD

commit 60a06ff09cb62d4102a89194ce8fef5c4c5a2f16
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Oct 23 16:13:28 2012 +1100

    vfs: Fix compilation of ACL support on solaris

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

Summary of changes:
 lib/replace/wscript              |    6 ++++--
 source3/modules/vfs_solarisacl.h |    6 ++++--
 source3/wscript                  |    9 +++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 732c664..c21a8f8 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -89,7 +89,10 @@ struct foo bar = { .y = 'X', .x = 1 };
 
     conf.CHECK_HEADERS('rpcsvc/nis.h rpcsvc/ypclnt.h sys/prctl.h sys/sysctl.h')
     conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
-    conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h rpcsvc/yp_prot.h')
+    conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
+
+    conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
+
     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
     conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
     conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h')
@@ -227,7 +230,6 @@ struct foo bar = { .y = 'X', .x = 1 };
                         msg="Checking correct behavior of strtoll",
                         headers = 'errno.h',
                         execute = True,
-                        define_ret = True,
                         define = 'HAVE_BSD_STRTOLL',
                         )
     conf.CHECK_FUNCS('if_nametoindex strerror_r')
diff --git a/source3/modules/vfs_solarisacl.h b/source3/modules/vfs_solarisacl.h
index 84c2cb7..20f1051 100644
--- a/source3/modules/vfs_solarisacl.h
+++ b/source3/modules/vfs_solarisacl.h
@@ -22,10 +22,12 @@
 
 SMB_ACL_T solarisacl_sys_acl_get_file(vfs_handle_struct *handle,
 				      const char *path_p,
-				      SMB_ACL_TYPE_T type);
+				      SMB_ACL_TYPE_T type, 
+				      TALLOC_CTX *mem_ctx);
 
 SMB_ACL_T solarisacl_sys_acl_get_fd(vfs_handle_struct *handle,
-				    files_struct *fsp);
+				    files_struct *fsp, 
+				    TALLOC_CTX *mem_ctx);
 
 int solarisacl_sys_acl_set_file(vfs_handle_struct *handle,
 				const char *name,
diff --git a/source3/wscript b/source3/wscript
index 92575c8..f049700 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -266,6 +266,14 @@ __sys_llseek syslog _telldir __telldir textdomain timegm
 utimensat vsyslog _write __write __xstat
 ''')
 
+    conf.CHECK_CODE('''
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+int i; i = prtcl(0); 
+''', 
+                    'HAVE_PRCTL', link=False)
+
     conf.CHECK_SAMBA3_CHARSET() # see build/charset.py
 
     # FIXME: these should be tests for features, but the old build system just
@@ -289,6 +297,7 @@ utimensat vsyslog _write __write __xstat
         conf.ADD_CFLAGS('-fno-common')
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
     elif (host_os.rfind('freebsd') > -1):
+        conf.DEFINE('FREEBSD', 1)
         if conf.CHECK_HEADERS('sunacl.h'):
             conf.DEFINE('HAVE_FREEBSD_SUNACL_H', '1')
             conf.CHECK_FUNCS_IN('acl', 'sunacl')


-- 
Samba Shared Repository