summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-02-22 09:28:51 +0100
committerStefan Metzmacher <metze@samba.org>2008-02-25 08:03:41 +0100
commitd5414cdc63b797a47fcbd1f55df98c7dd850ffa6 (patch)
treef100eacdd17d90c1a4c4d455626e0deb81c8894d
parenta56bd4fa82bcb5c586f182e8123f2fc41b12e41d (diff)
downloadsamba-d5414cdc63b797a47fcbd1f55df98c7dd850ffa6.tar.gz
samba-d5414cdc63b797a47fcbd1f55df98c7dd850ffa6.tar.bz2
samba-d5414cdc63b797a47fcbd1f55df98c7dd850ffa6.zip
pvfs_unlink: move !name->stream_exists into the caller
metze (This used to be commit e01554e1617dc3c08a4ed6b4e016fd627f529ef9)
-rw-r--r--source4/ntvfs/posix/pvfs_unlink.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/ntvfs/posix/pvfs_unlink.c b/source4/ntvfs/posix/pvfs_unlink.c
index 8dbf9ee724..2b96a5032c 100644
--- a/source4/ntvfs/posix/pvfs_unlink.c
+++ b/source4/ntvfs/posix/pvfs_unlink.c
@@ -34,10 +34,6 @@ static NTSTATUS pvfs_unlink_stream(struct pvfs_state *pvfs,
{
NTSTATUS status;
- if (!name->stream_exists) {
- return NT_STATUS_OBJECT_NAME_NOT_FOUND;
- }
-
/* make sure its matches the given attributes */
status = pvfs_match_attrib(pvfs, name,
unl->unlink.in.attrib, 0);
@@ -135,6 +131,10 @@ NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs,
}
if (name->stream_name) {
+ if (!name->stream_exists) {
+ return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+ }
+
return pvfs_unlink_stream(pvfs, req, unl, name);
}