[SCM] Samba Shared Repository - branch master updated - 7bd7846df7a28b9a066fd4d862de0e4d81aadb86

[Steven Danneman]

The branch, master has been updated
       via  7bd7846df7a28b9a066fd4d862de0e4d81aadb86 (commit)
      from  0744c32678da3757d5e16802e4c153bae72b961a (commit)

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


- Log -----------------------------------------------------------------
commit 7bd7846df7a28b9a066fd4d862de0e4d81aadb86
Author: Steven Danneman <steven.danneman at isilon.com>
Date:   Sun Nov 30 16:26:10 2008 -0800

    Make nt4_compatible_acls() non-static for use by VFS ACL modules.

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

Summary of changes:
 source3/include/proto.h   |    1 +
 source3/smbd/posix_acls.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2dd9b61..4bc524f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -8226,6 +8226,7 @@ void reply_pipe_close(connection_struct *conn, struct smb_request *req);
 /* The following definitions come from smbd/posix_acls.c  */
 
 void create_file_sids(const SMB_STRUCT_STAT *psbuf, DOM_SID *powner_sid, DOM_SID *pgroup_sid);
+bool nt4_compatible_acls(void);
 NTSTATUS unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp, uint32 security_info_sent, const SEC_DESC *psd);
 SMB_ACL_T free_empty_sys_acl(connection_struct *conn, SMB_ACL_T the_acl);
 NTSTATUS posix_fget_nt_acl(struct files_struct *fsp, uint32_t security_info,
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 0529d27..97fd3b2 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -870,7 +870,7 @@ static void merge_aces( canon_ace **pp_list_head )
  Check if we need to return NT4.x compatible ACL entries.
 ****************************************************************************/
 
-static bool nt4_compatible_acls(void)
+bool nt4_compatible_acls(void)
 {
 	int compat = lp_acl_compatibility();
 


-- 
Samba Shared Repository