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

[vlendec at samba.org]

Author: vlendec
Date: 2007-01-18 12:49:59 +0000 (Thu, 18 Jan 2007)
New Revision: 20877

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

Log:
Random notify fixes
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-18 11:31:38 UTC (rev 20876)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2007-01-18 12:49:59 UTC (rev 20877)
@@ -1866,7 +1866,8 @@
 
 		if (SMB_VFS_UNLINK(conn,directory) == 0) {
 			count++;
-			notify_fname(conn, directory, -1,
+			notify_fname(conn, directory,
+				     FILE_NOTIFY_CHANGE_FILE,
 				     NOTIFY_ACTION_REMOVED);
 		}
 	} else {
@@ -1929,7 +1930,8 @@
 				DEBUG(3,("unlink_internals: succesful unlink "
 					 "[%s]\n",fname));
 				notify_action(conn, directory, dname,
-					      -1, NOTIFY_ACTION_REMOVED);
+					      FILE_NOTIFY_CHANGE_FILE,
+					      NOTIFY_ACTION_REMOVED);
 			}
 				
 		}
@@ -3718,6 +3720,8 @@
 
 	ret = SMB_VFS_RMDIR(conn,directory);
 	if (ret == 0) {
+		notify_fname(conn, directory, FILE_NOTIFY_CHANGE_DIR_NAME,
+			     NOTIFY_ACTION_REMOVED);
 		return True;
 	}
 
@@ -3795,18 +3799,9 @@
 		return False;
 	}
 
-	{
-		char *parent_dir;
-		const char *dirname;
+	notify_fname(conn, directory, FILE_NOTIFY_CHANGE_DIR_NAME,
+		     NOTIFY_ACTION_REMOVED);
 
-		if (parent_dirname_talloc(tmp_talloc_ctx(), directory,
-					  &parent_dir, &dirname)) {
-			notify_action(conn, parent_dir, dirname, -1,
-				      NOTIFY_ACTION_REMOVED);
-			TALLOC_FREE(parent_dir); /* Not strictly necessary */
-		}
-	}
-
 	return True;
 }