diff options
| author | Jeremy Allison <jra@samba.org> | 2011-02-07 20:46:36 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-02-08 06:34:41 +0100 |
| commit | e68f6adca9494166bf7c24c358ea1af718970b0d (patch) | |
| tree | 59e037538cbd333b367615c690ed218f93b66878 /source3/modules | |
| parent | dd7313a1307aa2b3e7d10678a2bce6690e1c2125 (diff) | |
| download | samba-e68f6adca9494166bf7c24c358ea1af718970b0d.tar.gz samba-e68f6adca9494166bf7c24c358ea1af718970b0d.tar.bz2 samba-e68f6adca9494166bf7c24c358ea1af718970b0d.zip | |
If possible (O_DIRECTORY exists) open an fd for a directory open.
Start of the move towards handle-based code for directory access.
Currently makes fstat/fchown code work for directories rather than
falling back to pathnames.
Jeremy.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Feb 8 06:34:41 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/nfs4_acls.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_afsacl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 6e6b015f07..952bc9c6c1 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -186,7 +186,7 @@ static int smbacl4_fGetFileOwner(files_struct *fsp, SMB_STRUCT_STAT *psbuf) { memset(psbuf, 0, sizeof(SMB_STRUCT_STAT)); - if (fsp->is_directory || fsp->fh->fd == -1) { + if (fsp->fh->fd == -1) { return smbacl4_GetFileOwner(fsp->conn, fsp->fsp_name->base_name, psbuf); } diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 8e61351a1a..df4a20a90b 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -682,7 +682,7 @@ static size_t afs_fto_nt_acl(struct afs_acl *afs_acl, { SMB_STRUCT_STAT sbuf; - if (fsp->is_directory || fsp->fh->fd == -1) { + if (fsp->fh->fd == -1) { /* Get the stat struct for the owner info. */ return afs_to_nt_acl(afs_acl, fsp->conn, fsp->fsp_name, security_info, ppdesc); |