Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

diff --git a/source3/configure.in b/source3/configure.in
index 1adb56ad91e2a88acb6d51664c47bdf9316fdc32..287189f09380e545f65dc44e5927071f935197ba 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1033,6 +1033,8 @@ AC_CHECK_FUNCS(gettext dgettext)
 
 # Find a method of generating a stack trace
 AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
+# libexecinfo provides backtrace_symbols on FreeBSD
+AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
 AC_CHECK_FUNCS(backtrace_symbols)
 AC_CHECK_LIB(exc, trace_back_stack)
 

diff --git a/source3/modules/nfs4_acls.h b/source3/modules/nfs4_acls.h
index 0f783aa977c7cb43451bdae678ab5c933a57f0e9..a227c6e0fcaac486ec0e210e338fb688dc65e819 100644 (file)
--- a/source3/modules/nfs4_acls.h
+++ b/source3/modules/nfs4_acls.h
@@ -144,7 +144,7 @@ typedef bool (*set_nfs4acl_native_fn_t)(files_struct *, SMB4ACL_T *);
 
 NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp,
        uint32 security_info_sent,
-       SEC_DESC *psd,
+       const SEC_DESC *psd,
        set_nfs4acl_native_fn_t set_nfs4_native);
 
 #endif /* __NFS4_ACLS_H__ */