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_search.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_search.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_search.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c index 1464609e98..ff9ad20b43 100644 --- a/source4/ntvfs/posix/pvfs_search.c +++ b/source4/ntvfs/posix/pvfs_search.c @@ -54,7 +54,7 @@ static NTSTATUS fill_search_info(struct pvfs_state *pvfs, return status; } - if (!pvfs_match_attrib(pvfs, name, search->search_attrib)) { + if (!pvfs_match_attrib(pvfs, name, search->search_attrib, search->must_attrib)) { return NT_STATUS_OBJECT_NAME_NOT_FOUND; } @@ -296,7 +296,8 @@ static NTSTATUS pvfs_search_first_old(struct ntvfs_module_context *ntvfs, search->handle = id; search->dir = dir; search->current_index = 0; - search->search_attrib = search_attrib; + search->search_attrib = search_attrib & 0xFF; + search->must_attrib = (search_attrib>>8) & 0xFF; talloc_set_destructor(search, pvfs_search_destructor); @@ -425,6 +426,7 @@ NTSTATUS pvfs_search_first(struct ntvfs_module_context *ntvfs, search->dir = dir; search->current_index = 0; search->search_attrib = search_attrib; + search->must_attrib = 0; talloc_set_destructor(search, pvfs_search_destructor); |