svn commit: samba r20617 - in branches/SAMBA_3_0/source/smbd: .

[vlendec]

Author: vlendec
Date: 2007-01-08 20:06:36 +0000 (Mon, 08 Jan 2007)
New Revision: 20617

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20617

Log:
Do not notify if the delete failed
Modified:
   branches/SAMBA_3_0/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c      2007-01-08 17:28:14 UTC (rev 
20616)
+++ branches/SAMBA_3_0/source/smbd/reply.c      2007-01-08 20:06:36 UTC (rev 
20617)
@@ -2032,10 +2032,10 @@
 
                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 @@
                                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);