diff options
| author | Volker Lendecke <vl@samba.org> | 2012-10-09 09:41:41 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2012-10-09 13:38:49 +0200 |
| commit | 1c35c22e62253835e1c82fd44fe8532f6e79dbb9 (patch) | |
| tree | 75e44e56bfd23df62163b443d8131e63b5dca63a | |
| parent | e65a24b59f1dc7d212a46014a1d7c2531263529f (diff) | |
| download | samba-1c35c22e62253835e1c82fd44fe8532f6e79dbb9.tar.gz samba-1c35c22e62253835e1c82fd44fe8532f6e79dbb9.tar.bz2 samba-1c35c22e62253835e1c82fd44fe8532f6e79dbb9.zip | |
s3: Pass down smb_filename to smbacl4_fill_ace4
A full fsp is a bit overkill here
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Tue Oct 9 13:38:49 CEST 2012 on sn-devel-104
| -rw-r--r-- | source3/modules/nfs4_acls.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index b4fd51451f..05f90f77df 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -574,7 +574,7 @@ static SMB_ACE4PROP_T *smbacl4_find_equal_special( static bool smbacl4_fill_ace4( TALLOC_CTX *mem_ctx, - const files_struct *fsp, + const struct smb_filename *filename, smbacl4_vfs_params *params, uid_t ownerUID, gid_t ownerGID, @@ -582,7 +582,6 @@ static bool smbacl4_fill_ace4( SMB_ACE4PROP_T *ace_v4 /* output */ ) { - const char *filename = fsp->fsp_name->base_name; DEBUG(10, ("got ace for %s\n", sid_string_dbg(&ace_nt->trustee))); memset(ace_v4, 0, sizeof(SMB_ACE4PROP_T)); @@ -594,8 +593,8 @@ static bool smbacl4_fill_ace4( ace_nt->flags); /* remove inheritance flags on files */ - if (VALID_STAT(fsp->fsp_name->st) && - !S_ISDIR(fsp->fsp_name->st.st_ex_mode)) { + if (VALID_STAT(filename->st) && + !S_ISDIR(filename->st.st_ex_mode)) { DEBUG(10, ("Removing inheritance flags from a file\n")); ace_v4->aceFlags &= ~(SMB_ACE4_FILE_INHERIT_ACE| SMB_ACE4_DIRECTORY_INHERIT_ACE| @@ -641,7 +640,8 @@ static bool smbacl4_fill_ace4( } } else { DEBUG(1, ("nfs4_acls.c: file [%s]: could not " - "convert %s to uid or gid\n", filename, + "convert %s to uid or gid\n", + filename->base_name, sid_string_dbg(&ace_nt->trustee))); return False; } @@ -707,7 +707,7 @@ static SMB4ACL_T *smbacl4_win2nfs4( SMB_ACE4PROP_T ace_v4; bool addNewACE = True; - if (!smbacl4_fill_ace4(mem_ctx, fsp, pparams, + if (!smbacl4_fill_ace4(mem_ctx, fsp->fsp_name, pparams, ownerUID, ownerGID, dacl->aces + i, &ace_v4)) { DEBUG(3, ("Could not fill ace for file %s, SID %s\n", |