diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-28 00:44:14 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-28 00:44:14 +0100 |
| commit | 18d80bdf1fc5a281358aef29324230698eb434d4 (patch) | |
| tree | e2515f11577052f42a227bc04541d572d7f2e1ff /source4/ntvfs/posix/pvfs_unlink.c | |
| parent | ac604330871504e88e4bcd37433bbf3717d97a88 (diff) | |
| parent | e15b35e3897e63b9e815a04101436439d4aebdef (diff) | |
| download | samba-18d80bdf1fc5a281358aef29324230698eb434d4.tar.gz samba-18d80bdf1fc5a281358aef29324230698eb434d4.tar.bz2 samba-18d80bdf1fc5a281358aef29324230698eb434d4.zip | |
Merge v4.0-test
(This used to be commit 977dbdeaf363c8905ed9fd0570eba4be80582833)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_unlink.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_unlink.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/ntvfs/posix/pvfs_unlink.c b/source4/ntvfs/posix/pvfs_unlink.c index 7a2d964b9d..4cb47a4f1f 100644 --- a/source4/ntvfs/posix/pvfs_unlink.c +++ b/source4/ntvfs/posix/pvfs_unlink.c @@ -219,6 +219,12 @@ NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs, return pvfs_unlink_one(pvfs, req, unl, name); } + /* + * disable async requests in the wildcard case + * untill we have proper tests for this + */ + req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC; + /* get list of matching files */ status = pvfs_list_start(pvfs, name, req, &dir); if (!NT_STATUS_IS_OK(status)) { |