diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-02-28 03:47:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:52:08 -0500 |
| commit | 40a8d58551526a0f367d23d0c9603a5b9d86b270 (patch) | |
| tree | ecc25f71a1ae366b757e711c8f69bd206903092e /source4/ntvfs/posix/pvfs_qfileinfo.c | |
| parent | e3e048630be2fbf20d580850e5673ad372bd34f0 (diff) | |
| download | samba-40a8d58551526a0f367d23d0c9603a5b9d86b270.tar.gz samba-40a8d58551526a0f367d23d0c9603a5b9d86b270.tar.bz2 samba-40a8d58551526a0f367d23d0c9603a5b9d86b270.zip | |
r13739: a fairly major overhaul of the opendb code to allow the BASE-DELETE
test to pass. To try to make the code a bit more understandable, I
moved to using an IDL description of the opendb tdb record format.
One of the larger changes was to make directory opens and creates go
via the opendb code, so directory operations now obey all the share
mode restrictions, as well as delete on close semantics. I also
changed the period over which the opendb locks are held, to try to
minimise races due to two open operations happening at the same time.
(This used to be commit cd2602d05725e1734b0862131dd91601c6b6d51a)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_qfileinfo.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_qfileinfo.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c index 1f2f86e953..ca26331373 100644 --- a/source4/ntvfs/posix/pvfs_qfileinfo.c +++ b/source4/ntvfs/posix/pvfs_qfileinfo.c @@ -185,7 +185,7 @@ static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs, case RAW_FILEINFO_STANDARD_INFORMATION: info->standard_info.out.alloc_size = name->dos.alloc_size; info->standard_info.out.size = name->st.st_size; - info->standard_info.out.nlink = name->st.st_nlink; + info->standard_info.out.nlink = name->dos.nlink; info->standard_info.out.delete_pending = 0; info->standard_info.out.directory = (name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY)? 1 : 0; @@ -210,7 +210,7 @@ static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs, info->all_info.out.attrib = name->dos.attrib; info->all_info.out.alloc_size = name->dos.alloc_size; info->all_info.out.size = name->st.st_size; - info->all_info.out.nlink = name->st.st_nlink; + info->all_info.out.nlink = name->dos.nlink; info->all_info.out.delete_pending = 0; info->all_info.out.directory = (name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY)? 1 : 0; @@ -298,6 +298,11 @@ NTSTATUS pvfs_qpathinfo(struct ntvfs_module_context *ntvfs, return NT_STATUS_OBJECT_NAME_NOT_FOUND; } + status = pvfs_can_stat(pvfs, req, name); + if (!NT_STATUS_IS_OK(status)) { + return NT_STATUS_DELETE_PENDING; + } + status = pvfs_access_check_simple(pvfs, req, name, pvfs_fileinfo_access(info->generic.level)); if (!NT_STATUS_IS_OK(status)) { @@ -345,7 +350,7 @@ NTSTATUS pvfs_qfileinfo(struct ntvfs_module_context *ntvfs, switch (info->generic.level) { case RAW_FILEINFO_STANDARD_INFO: case RAW_FILEINFO_STANDARD_INFORMATION: - if (h->create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE) { + if (pvfs_delete_on_close_set(pvfs, h, NULL, NULL)) { info->standard_info.out.delete_pending = 1; info->standard_info.out.nlink--; } @@ -353,7 +358,7 @@ NTSTATUS pvfs_qfileinfo(struct ntvfs_module_context *ntvfs, case RAW_FILEINFO_ALL_INFO: case RAW_FILEINFO_ALL_INFORMATION: - if (h->create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE) { + if (pvfs_delete_on_close_set(pvfs, h, NULL, NULL)) { info->all_info.out.delete_pending = 1; info->all_info.out.nlink--; } |