Use "get_end_members_of_list" query to perform more atomic operation.

[moira.git] / incremental / afs.c

diff --git a/incremental/afs.c b/incremental/afs.c
index 7e7796b567c24c265cc10114e35081e659f9f891..d8424cc4049e79b7117157f5c51224716f47b363 100644 (file)
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -328,7 +328,8 @@ get_members(ac, av, group)
        sleep(1);                               /* give the ptserver room */
        edit_group(1, group, av[0], av[1]);
     } else {
-       code = mr_query("get_members_of_list", 1, &av[1], get_members, group);
+       code = mr_query("get_end_members_of_list", 1, &av[1],
+                       get_members, group);
        if (code)
            critical_alert("incremental",
                           "Couldn't retrieve full membership of %s: %s",
@@ -413,6 +414,26 @@ int afterc;
      * LABEL change: rename/remount
      * Deletion: rename/unmount
      */
+    if (afterc < FS_CREATE) {
+       if (!strcmp(before[FS_TYPE], "AFS"))
+           critical_alert("incremental",
+                          "Could not delete AFS filesystem %s: Operation not supported\n",
+                          before[FS_NAME]);
+       return;
+    }
+
+    if (!strcmp(after[FS_TYPE], "AFS")) {
+       if (strcmp(before[FS_TYPE], "AFS")) {
+           critical_alert("incremental",
+                          "Cannot convert %s to an AFS filesystem: Operation not supported\n",
+                          after[FS_NAME]);
+       } else {
+           critical_alert("incremental",
+                          "Cannot change attributes of AFS filesystem %s: Operation not supported\n",
+                          after[FS_NAME]);
+       }
+       return;
+    }
 }