svn commit: samba r23466 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-06-13 11:32:46 +0000 (Wed, 13 Jun 2007)
New Revision: 23466

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

Log:
Fix RAW-NOTIFY: by using delete on close the notify is triggered deep
inside close_file() already.

Modified:
   branches/SAMBA_3_0/source/smbd/reply.c
   branches/SAMBA_3_0_26/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2007-06-13 11:04:31 UTC (rev 23465)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2007-06-13 11:32:46 UTC (rev 23466)
@@ -2012,9 +2012,6 @@
 		}
 
 		count++;
-		notify_fname(conn, NOTIFY_ACTION_REMOVED,
-			     FILE_NOTIFY_CHANGE_FILE_NAME,
-			     directory);
 	} else {
 		struct smb_Dir *dir_hnd = NULL;
 		long offset = 0;
@@ -2081,9 +2078,6 @@
 			count++;
 			DEBUG(3,("unlink_internals: succesful unlink [%s]\n",
 				 fname));
-			notify_fname(conn, NOTIFY_ACTION_REMOVED,
-				     FILE_NOTIFY_CHANGE_FILE_NAME,
-				     fname);
 		}
 		CloseDir(dir_hnd);
 	}

Modified: branches/SAMBA_3_0_26/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_26/source/smbd/reply.c	2007-06-13 11:04:31 UTC (rev 23465)
+++ branches/SAMBA_3_0_26/source/smbd/reply.c	2007-06-13 11:32:46 UTC (rev 23466)
@@ -2011,9 +2011,6 @@
 		}
 
 		count++;
-		notify_fname(conn, NOTIFY_ACTION_REMOVED,
-			     FILE_NOTIFY_CHANGE_FILE_NAME,
-			     directory);
 	} else {
 		struct smb_Dir *dir_hnd = NULL;
 		long offset = 0;
@@ -2080,9 +2077,6 @@
 			count++;
 			DEBUG(3,("unlink_internals: succesful unlink [%s]\n",
 				 fname));
-			notify_fname(conn, NOTIFY_ACTION_REMOVED,
-				     FILE_NOTIFY_CHANGE_FILE_NAME,
-				     fname);
 		}
 		CloseDir(dir_hnd);
 	}