r14925: trigger NOTIFY_ACTION_OLD_NAME and NOTIFY_ACTION_NEW_NAME events for

renames, if in the same directory. For renames between directories
generate NOTIFY_ACTION_REMOVED and NOTIFY_ACTION_ADDED
(This used to be commit 2ac248edf05c3ee715165f2b33055de480743e87)

diff --git a/source4/ntvfs/posix/pvfs_rename.c b/source4/ntvfs/posix/pvfs_rename.c
index e69cbcde0b171a54f750d19b54f261494209aa84..824581cdafa121a75d0cdb749a49a0cc63382149 100644 (file)
--- a/source4/ntvfs/posix/pvfs_rename.c
+++ b/source4/ntvfs/posix/pvfs_rename.c
@@ -24,6 +24,50 @@
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/security.h"
 
+
+/*
+  do a file rename, and send any notify triggers
+*/
+NTSTATUS pvfs_do_rename(struct pvfs_state *pvfs, const char *name1, const char *name2)
+{
+       const char *r1, *r2;
+
+       if (rename(name1, name2) == -1) {
+               return pvfs_map_errno(pvfs, errno);
+       }
+
+       /* 
+          renames to the same directory cause a OLD_NAME->NEW_NAME notify.
+          renames to a different directory are considered a remove/add 
+       */
+       r1 = strrchr_m(name1, '/');
+       r2 = strrchr_m(name2, '/');
+
+       if ((r1-name1) != (r2-name2) ||
+           strncmp(name1, name2, r1-name1) != 0) {
+               notify_trigger(pvfs->notify_context, 
+                              NOTIFY_ACTION_REMOVED, 
+                              FILE_NOTIFY_CHANGE_FILE_NAME,
+                              name1);
+               notify_trigger(pvfs->notify_context, 
+                              NOTIFY_ACTION_ADDED, 
+                              FILE_NOTIFY_CHANGE_FILE_NAME,
+                              name2);
+       } else {
+               notify_trigger(pvfs->notify_context, 
+                              NOTIFY_ACTION_OLD_NAME, 
+                              FILE_NOTIFY_CHANGE_FILE_NAME,
+                              name1);
+               notify_trigger(pvfs->notify_context, 
+                              NOTIFY_ACTION_NEW_NAME, 
+                              FILE_NOTIFY_CHANGE_FILE_NAME,
+                              name2);
+       }
+       
+       return NT_STATUS_OK;
+}
+
+
 /*
   resolve a wildcard rename pattern. This works on one component of the name
 */
@@ -173,18 +217,10 @@ static NTSTATUS pvfs_rename_one(struct pvfs_state *pvfs,
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (rename(name1->full_name, fname2) == -1) {
-               talloc_free(mem_ctx);
-               return pvfs_map_errno(pvfs, errno);
-       }
-
-       status = odb_rename(lck, fname2);
+       status = pvfs_do_rename(pvfs, name1->full_name, fname2);
 
        if (NT_STATUS_IS_OK(status)) {
-               notify_trigger(pvfs->notify_context, 
-                              NOTIFY_ACTION_MODIFIED, 
-                              FILE_NOTIFY_CHANGE_FILE_NAME,
-                              name1->full_name);
+               status = odb_rename(lck, fname2);
        }
 
 failed:
@@ -302,11 +338,10 @@ static NTSTATUS pvfs_rename_mv(struct ntvfs_module_context *ntvfs,
                return status;
        }
 
-       if (rename(name1->full_name, name2->full_name) == -1) {
-               return pvfs_map_errno(pvfs, errno);
+       status = pvfs_do_rename(pvfs, name1->full_name, name2->full_name);
+       if (NT_STATUS_IS_OK(status)) {
+               status = odb_rename(lck, name2->full_name);
        }
-
-       status = odb_rename(lck, name2->full_name);
        
        return NT_STATUS_OK;
 }
@@ -375,19 +410,14 @@ static NTSTATUS pvfs_rename_nt(struct ntvfs_module_context *ntvfs,
        switch (ren->ntrename.in.flags) {
        case RENAME_FLAG_RENAME:
                status = pvfs_access_check_parent(pvfs, req, name2, SEC_DIR_ADD_FILE);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
-               if (rename(name1->full_name, name2->full_name) == -1) {
-                       return pvfs_map_errno(pvfs, errno);
-               }
+               NT_STATUS_NOT_OK_RETURN(status);
+               status = pvfs_do_rename(pvfs, name1->full_name, name2->full_name);
+               NT_STATUS_NOT_OK_RETURN(status);
                break;
 
        case RENAME_FLAG_HARD_LINK:
                status = pvfs_access_check_parent(pvfs, req, name2, SEC_DIR_ADD_FILE);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
+               NT_STATUS_NOT_OK_RETURN(status);
                if (link(name1->full_name, name2->full_name) == -1) {
                        return pvfs_map_errno(pvfs, errno);
                }
@@ -395,9 +425,7 @@ static NTSTATUS pvfs_rename_nt(struct ntvfs_module_context *ntvfs,
 
        case RENAME_FLAG_COPY:
                status = pvfs_access_check_parent(pvfs, req, name2, SEC_DIR_ADD_FILE);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
+               NT_STATUS_NOT_OK_RETURN(status);
                return pvfs_copy_file(pvfs, name1, name2);
 
        case RENAME_FLAG_MOVE_CLUSTER_INFORMATION:

diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c
index 72c061078ce3f5f1024cbaeafd51c1fab1f63b72..9f5153eb4bd0c8740837482c5786d197a854ba4f 100644 (file)
--- a/source4/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_setfileinfo.c
@@ -147,18 +147,12 @@ static NTSTATUS pvfs_setfileinfo_rename(struct pvfs_state *pvfs,
                return status;
        }
 
-       if (rename(name->full_name, name2->full_name) == -1) {
-               return pvfs_map_errno(pvfs, errno);
+       status = pvfs_do_rename(pvfs, name->full_name, name2->full_name);
+       if (NT_STATUS_IS_OK(status)) {
+               name->full_name = talloc_steal(name, name2->full_name);
+               name->original_name = talloc_steal(name, name2->original_name);
        }
 
-       notify_trigger(pvfs->notify_context, 
-                      NOTIFY_ACTION_MODIFIED, 
-                      FILE_NOTIFY_CHANGE_FILE_NAME,
-                      name->full_name);
-
-       name->full_name = talloc_steal(name, name2->full_name);
-       name->original_name = talloc_steal(name, name2->original_name);
-
        return NT_STATUS_OK;
 }
 

diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c
index 1be57dd55ad3a1d55ba2d7e3571861b86c6a53d4..85831c80e90dcb69f6dc078a75fd9e159267f821 100644 (file)
--- a/source4/ntvfs/sysdep/sys_notify.c
+++ b/source4/ntvfs/sysdep/sys_notify.c
@@ -97,7 +97,7 @@ NTSTATUS sys_notify_watch(struct sys_notify_context *ctx, struct notify_entry *e
                          sys_notify_callback_t callback, void *private, void **handle)
 {
        if (!ctx->notify_watch) {
-               return NT_STATUS_NOT_IMPLEMENTED;
+               return NT_STATUS_INVALID_SYSTEM_SERVICE;
        }
        return ctx->notify_watch(ctx, e, callback, private, handle);
 }