summaryrefslogtreecommitdiff
path: root/source3/smbd/reply.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-01-07 18:08:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:57 -0500
commitb2efff8fe5cdfd031a7b6f814993a9c234a66ee8 (patch)
treee234e62e7e034976df2e6d3ff663489d95ac46ea /source3/smbd/reply.c
parentbb357a1617761177475a422008a14a1ac0435eb1 (diff)
downloadsamba-b2efff8fe5cdfd031a7b6f814993a9c234a66ee8.tar.gz
samba-b2efff8fe5cdfd031a7b6f814993a9c234a66ee8.tar.bz2
samba-b2efff8fe5cdfd031a7b6f814993a9c234a66ee8.zip
r20597: Survive some of the notify mask tests.
(This used to be commit e4a2e63272dc5b20413597179d06b0185c4a6817)
Diffstat (limited to 'source3/smbd/reply.c')
-rw-r--r--source3/smbd/reply.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index d33940aa64..62fd0ea686 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2026,9 +2026,6 @@ NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype,
mangle_check_cache( mask, sizeof(pstring)-1, conn->params );
if (!has_wild) {
- char *dir;
- const char *fname;
-
pstrcat(directory,"/");
pstrcat(directory,mask);
error = can_delete(conn,directory,dirtype,bad_path);
@@ -2039,12 +2036,7 @@ NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype,
count++;
}
- if (parent_dirname_talloc(tmp_talloc_ctx(), orig_name,
- &dir, &fname)) {
- notify_action(conn, dir, fname, -1,
- NOTIFY_ACTION_REMOVED);
- TALLOC_FREE(dir); /* not strictly necessary */
- }
+ notify_fname(conn, orig_name, -1, NOTIFY_ACTION_REMOVED);
} else {
struct smb_Dir *dir_hnd = NULL;