diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-21 18:20:33 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-11-21 18:20:33 -0800 |
| commit | dcc4661d4ab55526444f742a2f9634ec14832054 (patch) | |
| tree | d9a7f39cecad48e2ead374e8a7ef20f1feb8c38a | |
| parent | ecd8c5d3078f4fd06586485665f956520b2314a3 (diff) | |
| parent | 3d30d5945cf561c5baf2716d8f41870cecf947c0 (diff) | |
| download | samba-dcc4661d4ab55526444f742a2f9634ec14832054.tar.gz samba-dcc4661d4ab55526444f742a2f9634ec14832054.tar.bz2 samba-dcc4661d4ab55526444f742a2f9634ec14832054.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/modules/nfs4_acls.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in index 1adb56ad91..287189f093 100644 --- 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 0f783aa977..a227c6e0fc 100644 --- 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__ */ |