diff options
| author | Alexander Bokovoy <ab@samba.org> | 2006-08-01 07:38:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:27 -0500 |
| commit | 4cf5769331bb9432fb7455f6eb0384b0282f605f (patch) | |
| tree | 571d9203e6d14b21f4740807a4a2be8b41696d4e /source3/smbd | |
| parent | 430fa0eba08cbf180d83740a895a0018af1c7f21 (diff) | |
| download | samba-4cf5769331bb9432fb7455f6eb0384b0282f605f.tar.gz samba-4cf5769331bb9432fb7455f6eb0384b0282f605f.tar.bz2 samba-4cf5769331bb9432fb7455f6eb0384b0282f605f.zip | |
r17353: Add support for JFS2 NFS4/AIXC and GPFS acls based on NFSv4 ACLs.
(This used to be commit 72312cb2e255301f978455a559461ad83b13b6cb)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/posix_acls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index a431f6e07a..a1903ef4bb 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/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; } |