mirror of
https://github.com/samba-team/samba.git
synced 2025-03-10 12:58:35 +03:00
r21087: Make the param list of notify_fname match notify_trigger
(This used to be commit defa28f9c3eda85a072b972fffd2d5de8bcf01f7)
This commit is contained in:
parent
113e21f0a5
commit
547f77778a
@ -492,8 +492,8 @@ int file_set_dosmode(connection_struct *conn, const char *fname,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ((ret = SMB_VFS_CHMOD(conn,fname,unixmode)) == 0) {
|
if ((ret = SMB_VFS_CHMOD(conn,fname,unixmode)) == 0) {
|
||||||
notify_fname(conn, fname, FILE_NOTIFY_CHANGE_ATTRIBUTES,
|
notify_fname(conn, NOTIFY_ACTION_MODIFIED,
|
||||||
NOTIFY_ACTION_MODIFIED);
|
FILE_NOTIFY_CHANGE_ATTRIBUTES, fname);
|
||||||
return 0;
|
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);
|
ret = SMB_VFS_FCHMOD(fsp, fsp->fh->fd, unixmode);
|
||||||
unbecome_root();
|
unbecome_root();
|
||||||
close_file_fchmod(fsp);
|
close_file_fchmod(fsp);
|
||||||
notify_fname(conn, fname, FILE_NOTIFY_CHANGE_ATTRIBUTES,
|
notify_fname(conn, NOTIFY_ACTION_MODIFIED,
|
||||||
NOTIFY_ACTION_MODIFIED);
|
FILE_NOTIFY_CHANGE_ATTRIBUTES, fname);
|
||||||
}
|
}
|
||||||
|
|
||||||
return( ret );
|
return( ret );
|
||||||
@ -599,8 +599,8 @@ BOOL set_filetime(connection_struct *conn, const char *fname, time_t mtime)
|
|||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
|
||||||
notify_fname(conn, fname, FILE_NOTIFY_CHANGE_LAST_WRITE,
|
notify_fname(conn, NOTIFY_ACTION_MODIFIED,
|
||||||
NOTIFY_ACTION_MODIFIED);
|
FILE_NOTIFY_CHANGE_LAST_WRITE, fname);
|
||||||
|
|
||||||
return(True);
|
return(True);
|
||||||
}
|
}
|
||||||
|
@ -402,8 +402,8 @@ void notify_action(connection_struct *conn, const char *parent,
|
|||||||
TALLOC_FREE(lck);
|
TALLOC_FREE(lck);
|
||||||
}
|
}
|
||||||
|
|
||||||
void notify_fname(connection_struct *conn, const char *path,
|
void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
|
||||||
uint32 filter, uint32 action)
|
const char *path)
|
||||||
{
|
{
|
||||||
char *parent;
|
char *parent;
|
||||||
const char *name;
|
const char *name;
|
||||||
|
@ -309,8 +309,8 @@ static NTSTATUS open_file(files_struct *fsp,
|
|||||||
fsp);
|
fsp);
|
||||||
}
|
}
|
||||||
|
|
||||||
notify_action(conn, parent_dir, name, -1,
|
notify_fname(conn, NOTIFY_ACTION_ADDED,
|
||||||
NOTIFY_ACTION_ADDED);
|
FILE_NOTIFY_CHANGE_FILE_NAME, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -1866,9 +1866,9 @@ NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype,
|
|||||||
|
|
||||||
if (SMB_VFS_UNLINK(conn,directory) == 0) {
|
if (SMB_VFS_UNLINK(conn,directory) == 0) {
|
||||||
count++;
|
count++;
|
||||||
notify_fname(conn, directory,
|
notify_fname(conn, NOTIFY_ACTION_REMOVED,
|
||||||
FILE_NOTIFY_CHANGE_FILE_NAME,
|
FILE_NOTIFY_CHANGE_FILE_NAME,
|
||||||
NOTIFY_ACTION_REMOVED);
|
directory);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
struct smb_Dir *dir_hnd = NULL;
|
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);
|
ret = SMB_VFS_RMDIR(conn,directory);
|
||||||
if (ret == 0) {
|
if (ret == 0) {
|
||||||
notify_fname(conn, directory, FILE_NOTIFY_CHANGE_DIR_NAME,
|
notify_fname(conn, NOTIFY_ACTION_REMOVED,
|
||||||
NOTIFY_ACTION_REMOVED);
|
FILE_NOTIFY_CHANGE_DIR_NAME,
|
||||||
|
directory);
|
||||||
return True;
|
return True;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3793,8 +3794,9 @@ BOOL rmdir_internals(connection_struct *conn, const char *directory)
|
|||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
|
||||||
notify_fname(conn, directory, FILE_NOTIFY_CHANGE_DIR_NAME,
|
notify_fname(conn, NOTIFY_ACTION_REMOVED,
|
||||||
NOTIFY_ACTION_REMOVED);
|
FILE_NOTIFY_CHANGE_DIR_NAME,
|
||||||
|
directory);
|
||||||
|
|
||||||
return True;
|
return True;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user