r21087: Make the param list of notify_fname match notify_trigger

(This used to be commit defa28f9c3eda85a072b972fffd2d5de8bcf01f7)

4 files changed, 18 insertions, 16 deletions

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 44e637a0ee..ad79bbacdd 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -492,8 +492,8 @@ int file_set_dosmode(connection_struct *conn, const char *fname,
 	}
 
 	if ((ret = SMB_VFS_CHMOD(conn,fname,unixmode)) == 0) {
-		notify_fname(conn, fname, FILE_NOTIFY_CHANGE_ATTRIBUTES,
-			     NOTIFY_ACTION_MODIFIED);
+		notify_fname(conn, NOTIFY_ACTION_MODIFIED,
+			     FILE_NOTIFY_CHANGE_ATTRIBUTES, fname);
 		return 0;
 	}
 
@@ -524,8 +524,8 @@ int file_set_dosmode(connection_struct *conn, const char *fname,
 		ret = SMB_VFS_FCHMOD(fsp, fsp->fh->fd, unixmode);
 		unbecome_root();
 		close_file_fchmod(fsp);
-		notify_fname(conn, fname, FILE_NOTIFY_CHANGE_ATTRIBUTES,
-			     NOTIFY_ACTION_MODIFIED);
+		notify_fname(conn, NOTIFY_ACTION_MODIFIED,
+			     FILE_NOTIFY_CHANGE_ATTRIBUTES, fname);
 	}
 
 	return( ret );
@@ -599,8 +599,8 @@ BOOL set_filetime(connection_struct *conn, const char *fname, time_t mtime)
 		return False;
 	}
 
-	notify_fname(conn, fname, FILE_NOTIFY_CHANGE_LAST_WRITE,
-		     NOTIFY_ACTION_MODIFIED);
+	notify_fname(conn, NOTIFY_ACTION_MODIFIED,
+		     FILE_NOTIFY_CHANGE_LAST_WRITE, fname);
   
 	return(True);
 } 
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 97192d6e63..9cb121a039 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -402,8 +402,8 @@ void notify_action(connection_struct *conn, const char *parent,
 	TALLOC_FREE(lck);
 }
 
-void notify_fname(connection_struct *conn, const char *path,
-		  uint32 filter, uint32 action)
+void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
+		  const char *path)
 {
 	char *parent;
 	const char *name;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 529677a5f3..8dd4ed1925 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -309,8 +309,8 @@ static NTSTATUS open_file(files_struct *fsp,
 							    fsp);
 			}
 
-			notify_action(conn, parent_dir, name, -1,
-				      NOTIFY_ACTION_ADDED);
+			notify_fname(conn, NOTIFY_ACTION_ADDED,
+				     FILE_NOTIFY_CHANGE_FILE_NAME, path);
 		}
 
 	} else {
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 37c8a46ed3..7ffebd9118 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1866,9 +1866,9 @@ NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype,
 
 		if (SMB_VFS_UNLINK(conn,directory) == 0) {
 			count++;
-			notify_fname(conn, directory,
+			notify_fname(conn, NOTIFY_ACTION_REMOVED,
 				     FILE_NOTIFY_CHANGE_FILE_NAME,
-				     NOTIFY_ACTION_REMOVED);
+				     directory);
 		}
 	} else {
 		struct smb_Dir *dir_hnd = NULL;
@@ -3714,8 +3714,9 @@ BOOL rmdir_internals(connection_struct *conn, const char *directory)
 
 	ret = SMB_VFS_RMDIR(conn,directory);
 	if (ret == 0) {
-		notify_fname(conn, directory, FILE_NOTIFY_CHANGE_DIR_NAME,
-			     NOTIFY_ACTION_REMOVED);
+		notify_fname(conn, NOTIFY_ACTION_REMOVED,
+			     FILE_NOTIFY_CHANGE_DIR_NAME,
+			     directory);
 		return True;
 	}
 
@@ -3793,8 +3794,9 @@ BOOL rmdir_internals(connection_struct *conn, const char *directory)
 		return False;
 	}
 
-	notify_fname(conn, directory, FILE_NOTIFY_CHANGE_DIR_NAME,
-		     NOTIFY_ACTION_REMOVED);
+	notify_fname(conn, NOTIFY_ACTION_REMOVED,
+		     FILE_NOTIFY_CHANGE_DIR_NAME,
+		     directory);
 
 	return True;
 }