diff options
| author | Alexander Bokovoy <ab@samba.org> | 2006-08-01 08:27:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:27 -0500 |
| commit | 16bf23d973b899f570b6793cf52507086d74d66a (patch) | |
| tree | 408df31c99305ad43fc3f35c5c7626d486d2d5a2 /source3/smbd | |
| parent | 4cf5769331bb9432fb7455f6eb0384b0282f605f (diff) | |
| download | samba-16bf23d973b899f570b6793cf52507086d74d66a.tar.gz samba-16bf23d973b899f570b6793cf52507086d74d66a.tar.bz2 samba-16bf23d973b899f570b6793cf52507086d74d66a.zip | |
r17354: Revert -r 17353 per Volker request while gpfs compatibility layer code will be released.
(This used to be commit 5b1db0151461af18d994359e86c649922fc6de65)
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 a1903ef4bb..a431f6e07a 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. ****************************************************************************/ -BOOL unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp, uint32 security_info_sent, SEC_DESC *psd) +static BOOL unpack_nt_owners(int snum, SMB_STRUCT_STAT *psbuf, 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. ****************************************************************************/ -int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid) +static 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), &user, &grp, security_info_sent, psd)) { + if (!unpack_nt_owners( SNUM(conn), &sbuf, &user, &grp, security_info_sent, psd)) { return False; } |