Author: vlendec Date: 2007-01-31 14:14:57 +0000 (Wed, 31 Jan 2007) New Revision: 21087
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21087 Log: Make the param list of notify_fname match notify_trigger Modified: branches/SAMBA_3_0/source/smbd/dosmode.c branches/SAMBA_3_0/source/smbd/notify.c branches/SAMBA_3_0/source/smbd/open.c branches/SAMBA_3_0/source/smbd/reply.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/dosmode.c =================================================================== --- branches/SAMBA_3_0/source/smbd/dosmode.c 2007-01-31 14:05:09 UTC (rev 21086) +++ branches/SAMBA_3_0/source/smbd/dosmode.c 2007-01-31 14:14:57 UTC (rev 21087) @@ -492,8 +492,8 @@ } 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 @@ 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 @@ 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); } Modified: branches/SAMBA_3_0/source/smbd/notify.c =================================================================== --- branches/SAMBA_3_0/source/smbd/notify.c 2007-01-31 14:05:09 UTC (rev 21086) +++ branches/SAMBA_3_0/source/smbd/notify.c 2007-01-31 14:14:57 UTC (rev 21087) @@ -402,8 +402,8 @@ 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; Modified: branches/SAMBA_3_0/source/smbd/open.c =================================================================== --- branches/SAMBA_3_0/source/smbd/open.c 2007-01-31 14:05:09 UTC (rev 21086) +++ branches/SAMBA_3_0/source/smbd/open.c 2007-01-31 14:14:57 UTC (rev 21087) @@ -309,8 +309,8 @@ fsp); } - notify_action(conn, parent_dir, name, -1, - NOTIFY_ACTION_ADDED); + notify_fname(conn, NOTIFY_ACTION_ADDED, + FILE_NOTIFY_CHANGE_FILE_NAME, path); } } else { Modified: branches/SAMBA_3_0/source/smbd/reply.c =================================================================== --- branches/SAMBA_3_0/source/smbd/reply.c 2007-01-31 14:05:09 UTC (rev 21086) +++ branches/SAMBA_3_0/source/smbd/reply.c 2007-01-31 14:14:57 UTC (rev 21087) @@ -1866,9 +1866,9 @@ 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 @@ 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 @@ 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; }
