summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-04-03 00:17:18 +0000
committerJeremy Allison <jra@samba.org>2004-04-03 00:17:18 +0000
commit3d5fdced72a70a658f684da2430e6b625c80540a (patch)
tree8255a8862c6e949eb36519b66f8eec74ba1bb9f1 /source3
parentdb44caf191157b5a223b6bb5f6636d6e530a69c9 (diff)
downloadsamba-3d5fdced72a70a658f684da2430e6b625c80540a.tar.gz
samba-3d5fdced72a70a658f684da2430e6b625c80540a.tar.bz2
samba-3d5fdced72a70a658f684da2430e6b625c80540a.zip
Fix wildcard unlink.
Jeremy. (This used to be commit 6e9b4c57ccb385acb9feaf9f7412778474231a92)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 7498821185..42167c6e81 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1575,13 +1575,14 @@ NTSTATUS unlink_internals(connection_struct *conn, int dirtype, char *name)
if (sys_direntry) {
error = NT_STATUS_OBJECT_NAME_INVALID;
- continue;
+ break;
}
slprintf(fname,sizeof(fname)-1, "%s/%s",directory,dname);
error = can_delete(fname,conn,dirtype,bad_path);
- if (!NT_STATUS_IS_OK(error))
+ if (!NT_STATUS_IS_OK(error)) {
continue;
+ }
if (SMB_VFS_UNLINK(conn,fname) == 0)
count++;
DEBUG(3,("unlink_internals: succesful unlink [%s]\n",fname));