summaryrefslogtreecommitdiffstats
path: root/source/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-09-18 02:27:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:51:59 -0500
commita52fa218952ffcd784ea31e947aa4d17dfdc8ee0 (patch)
tree3261ec264e899f1a613a038cd7915680e44358ee /source/smbd
parent2ab0ab326210a6e2b23a15c0cfc8f21ac2fcceac (diff)
downloadsamba-a52fa218952ffcd784ea31e947aa4d17dfdc8ee0.tar.gz
samba-a52fa218952ffcd784ea31e947aa4d17dfdc8ee0.tar.xz
samba-a52fa218952ffcd784ea31e947aa4d17dfdc8ee0.zip
r18603: Add in the NFSv4 ACL mapping code from IBM.
Sorry for the delay :-). Jeremy.
Diffstat (limited to 'source/smbd')
-rw-r--r--source/smbd/posix_acls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index a431f6e07aa..a1903ef4bbf 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -901,7 +901,7 @@ static mode_t map_nt_perms( SEC_ACCESS sec_access, int type)
Unpack a SEC_DESC into a UNIX owner and group.
****************************************************************************/
-static BOOL unpack_nt_owners(int snum, SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *pgrp, uint32 security_info_sent, SEC_DESC *psd)
+BOOL unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp, uint32 security_info_sent, SEC_DESC *psd)
{
DOM_SID owner_sid;
DOM_SID grp_sid;
@@ -2989,7 +2989,7 @@ size_t get_nt_acl(files_struct *fsp, uint32 security_info, SEC_DESC **ppdesc)
then allow chown to the currently authenticated user.
****************************************************************************/
-static int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid)
+int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid)
{
int ret;
files_struct *fsp;
@@ -3105,7 +3105,7 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
* Unpack the user/group/world id's.
*/
- if (!unpack_nt_owners( SNUM(conn), &sbuf, &user, &grp, security_info_sent, psd)) {
+ if (!unpack_nt_owners( SNUM(conn), &user, &grp, security_info_sent, psd)) {
return False;
}