Suppress warning about ownership changes - administrators have been warned.

[moira.git] / incremental / afs.c

diff --git a/incremental/afs.c b/incremental/afs.c
index 1c1a623c42fd1c0e594cbb6305622fc2207b4864..4171c2a76c5cac4c1a0e7c9004fecdb9b48857b6 100644 (file)
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -170,7 +170,7 @@ int afterc;
            return;
        }
 
-       if (beforec) {
+       if (bstate != 0) {
            /* Reactivating a user; get his group list */
            gethostname(hostname, sizeof(hostname));
            code = mr_connect(hostname);
@@ -374,20 +374,22 @@ int afterc;
      *    Path change:  remount
      *    Type change:  ERR<-->AFS
      */
-    
+
+#if 0
     if (strcmp(before[FS_OWNER], after[FS_OWNER]) ||
-       strcmp(before[FS_OWNERS], after[FS_OWNERS)))
+       strcmp(before[FS_OWNERS], after[FS_OWNERS]))
     {
        critical_alert("incremental",
                       "Cannot change ownership of filesystem %s: Operation not yet supported",
                       after[FS_NAME]);
     }
+#endif
 
     sprintf(cmd, "%s/perl -I%s %s/afs_rename.pl %s %s %s %s %s %s %s %s %s %s",
            BIN_DIR, BIN_DIR, BIN_DIR,
-           before[FS_NAME], before[FS_CELL], before[FS_TYPE],
+           before[FS_NAME], before[FS_MACHINE], before[FS_TYPE],
            before[FS_L_TYPE], before[FS_PACK],
-           after[FS_NAME], after[FS_CELL], after[FS_TYPE],
+           after[FS_NAME], after[FS_MACHINE], after[FS_TYPE],
            after[FS_L_TYPE], after[FS_PACK]);
     run_cmd(cmd);
 }