diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-25 07:58:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:41 -0500 |
| commit | ee0c87b4c98e2d3878aa7ab7f8919aa16c4aa063 (patch) | |
| tree | 522611b1e1b35ac0c5117c675e78391e79d2a08f /source4/ntvfs/posix/pvfs_util.c | |
| parent | e1c43f243a7dea8c8a7ae235252091d1e18c2fb4 (diff) | |
| download | samba-ee0c87b4c98e2d3878aa7ab7f8919aa16c4aa063.tar.gz samba-ee0c87b4c98e2d3878aa7ab7f8919aa16c4aa063.tar.bz2 samba-ee0c87b4c98e2d3878aa7ab7f8919aa16c4aa063.zip | |
r3207: - reformat error msgs in BASE-DIR* tests
- added support for mandatory attributes in old style directory search
- we now pass BASE-DIR1 and BASE-DIR2
(This used to be commit efaa0eaec49e952aa515c3448246d9048a484c26)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_util.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_util.c b/source4/ntvfs/posix/pvfs_util.c index 3c65453798..ae1dc6236d 100644 --- a/source4/ntvfs/posix/pvfs_util.c +++ b/source4/ntvfs/posix/pvfs_util.c @@ -49,11 +49,15 @@ NTSTATUS pvfs_map_errno(struct pvfs_state *pvfs, int unix_errno) this is used by calls like unlink and search which take an attribute and only include special files if they match the given attribute */ -BOOL pvfs_match_attrib(struct pvfs_state *pvfs, struct pvfs_filename *name, uint32_t attrib) +BOOL pvfs_match_attrib(struct pvfs_state *pvfs, struct pvfs_filename *name, + uint32_t attrib, uint32_t must_attrib) { if ((name->dos.attrib & ~attrib) & (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_SYSTEM)) { return False; } + if (must_attrib & ~name->dos.attrib) { + return False; + } return True; } |