From a9e3624bbcb240104af186233ba2de87586d77d3 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 8 Jan 2007 20:06:36 +0000 Subject: r20617: Do not notify if the delete failed (This used to be commit c86fbdf8cc8f6f17b23e647bd1f4714c6095b860) --- source3/smbd/reply.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index ac0663d238..cc181223f2 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2032,10 +2032,10 @@ NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype, if (SMB_VFS_UNLINK(conn,directory) == 0) { count++; + notify_fname(conn, orig_name, -1, + NOTIFY_ACTION_REMOVED); } - notify_fname(conn, orig_name, -1, NOTIFY_ACTION_REMOVED); - } else { struct smb_Dir *dir_hnd = NULL; const char *dname; @@ -2092,10 +2092,12 @@ NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype, if (!NT_STATUS_IS_OK(error)) { continue; } - if (SMB_VFS_UNLINK(conn,fname) == 0) + if (SMB_VFS_UNLINK(conn,fname) == 0) { count++; - notify_action(conn, directory, dname, - -1, NOTIFY_ACTION_REMOVED); + notify_action( + conn, directory, dname, + -1, NOTIFY_ACTION_REMOVED); + } DEBUG(3,("unlink_internals: succesful unlink [%s]\n",fname)); } CloseDir(dir_hnd); -- cgit