diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-07-10 18:11:32 -0700 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-07-20 17:26:57 -0700 |
| commit | c9b8a017147211d86662f40dcf835b152ab90cf4 (patch) | |
| tree | 8b234318da33165a45422b4a09cb5fd3dacd2507 /source3/modules/vfs_zfsacl.c | |
| parent | 5a8d70d465f28ae02f4df7a3c2905e028c2e3142 (diff) | |
| download | samba-c9b8a017147211d86662f40dcf835b152ab90cf4.tar.gz samba-c9b8a017147211d86662f40dcf835b152ab90cf4.tar.bz2 samba-c9b8a017147211d86662f40dcf835b152ab90cf4.zip | |
s3: Finish plumbing the fsp->fsp_name smb_fname conversion through the modules.
Diffstat (limited to 'source3/modules/vfs_zfsacl.c')
| -rw-r--r-- | source3/modules/vfs_zfsacl.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c index a5b0490c8d..a92d5dae26 100644 --- a/source3/modules/vfs_zfsacl.c +++ b/source3/modules/vfs_zfsacl.c @@ -145,14 +145,14 @@ static bool zfs_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) SMB_ASSERT(i == naces); /* store acl */ - if(acl(fsp->fsp_name, ACE_SETACL, naces, acebuf)) { + if(acl(fsp->fsp_name->base_name, ACE_SETACL, naces, acebuf)) { if(errno == ENOSYS) { DEBUG(9, ("acl(ACE_SETACL, %s): Operation is not " "supported on the filesystem where the file " - "reside", fsp->fsp_name)); + "reside", fsp_str_dbg(fsp))); } else { - DEBUG(9, ("acl(ACE_SETACL, %s): %s ", fsp->fsp_name, - strerror(errno))); + DEBUG(9, ("acl(ACE_SETACL, %s): %s ", fsp_str_dbg(fsp), + strerror(errno))); } return 0; } @@ -180,7 +180,8 @@ static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle, SMB4ACL_T *pacl; NTSTATUS status; - status = zfs_get_nt_acl_common(fsp->fsp_name, security_info, &pacl); + status = zfs_get_nt_acl_common(fsp->fsp_name->base_name, security_info, + &pacl); if (!NT_STATUS_IS_OK(status)) { return status; } |