X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/1c2c987d76eddf0a65e949e46137708d263790de..8ec23c21783e8533cf7af22edd612cebfe200916:/incremental/afs.c

diff --git a/incremental/afs.c b/incremental/afs.c
index 80e73245..b38347bc 100644
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -180,22 +180,25 @@ int beforec;
 char **after;
 int afterc;
 {
-    int agid, bgid;
+    register int agid, bgid;
+    int ahide, bhide;
     long code, id;
     char hostname[64];
     char g1[PR_MAXNAMELEN], g2[PR_MAXNAMELEN];
     char *av[2];
 
     agid = bgid = 0;
-    if (beforec > L_GID && atoi(before[L_ACTIVE]) && atoi(before[L_GROUP]))
+    if (beforec > L_GID && atoi(before[L_ACTIVE]) && atoi(before[L_GROUP])) {
 	bgid = atoi(before[L_GID]);
-    if (afterc > L_GID && atoi(after[L_ACTIVE]) && atoi(after[L_GROUP]))
+	bhide = atoi(before[L_HIDDEN]);
+    }
+    if (afterc > L_GID && atoi(after[L_ACTIVE]) && atoi(after[L_GROUP])) {
 	agid = atoi(after[L_GID]);
+	ahide = atoi(after[L_HIDDEN]);
+    }
 
     if (agid == 0 && bgid == 0)			/* Not active groups */
 	return;
-    if (agid == bgid && !strcmp(after[L_NAME], before[L_NAME]))
-	return;					/* No change */
 
     code=pr_Initialize(1, AFSCONF_CLIENTNAME, 0);
     if (code) {
@@ -205,17 +208,30 @@ int afterc;
     }
 
     if (agid && bgid) {
-	/* Only a modify is required */
-	strcpy(g1, "system:");
-	strcpy(g2, "system:");
-	strcat(g1, before[L_NAME]);
-	strcat(g2, after[L_NAME]);
-	code = pr_ChangeEntry(g1, g2, (agid==bgid) ? 0 : -agid, "");
-	if (code) {
-	    critical_alert("incremental",
-			   "Couldn't change group %s (id %d) to %s (id %d): %s",
-			   before[L_NAME], -bgid, after[L_NAME], -agid,
-			   error_message(code));
+	if (strcmp(after[L_NAME], before[L_NAME])) {
+	    /* Only a modify is required */
+	    strcpy(g1, "system:");
+	    strcpy(g2, "system:");
+	    strcat(g1, before[L_NAME]);
+	    strcat(g2, after[L_NAME]);
+	    code = pr_ChangeEntry(g1, g2, (agid==bgid) ? 0 : -agid, "");
+	    if (code) {
+		critical_alert("incremental",
+			       "Couldn't change group %s (id %d) to %s (id %d): %s",
+			       before[L_NAME], -bgid, after[L_NAME], -agid,
+			       error_message(code));
+	    }
+	}
+	if (ahide != bhide) {
+	    code = pr_SetFieldsEntry
+		(-agid, PR_SF_ALLBITS,
+		 (ahide ? PRP_STATUS_MEM : PRP_GROUP_DEFAULT) >> PRIVATE_SHIFT,
+		 0 /*ngroups*/, 0 /*nusers*/);
+	    if (code) {
+		critical_alert("incremental",
+			       "Couldn't set flags of group %s: %s",
+			       after[L_NAME], error_message(code));
+	    }
 	}
 	return;
     }
@@ -240,6 +256,17 @@ int afterc;
 			   after[L_NAME], id, error_message(code));
 	    return;
 	}
+	if (ahide) {
+	    code = pr_SetFieldsEntry
+		(-agid, PR_SF_ALLBITS,
+		 (ahide ? PRP_STATUS_MEM : PRP_GROUP_DEFAULT) >> PRIVATE_SHIFT,
+		 0 /*ngroups*/, 0 /*nusers*/);
+	    if (code) {
+		critical_alert("incremental",
+			       "Couldn't set flags of group %s: %s",
+			       after[L_NAME], error_message(code));
+	    }
+	}
 
 	/* We need to make sure the group is properly populated */
 	if (beforec < L_ACTIVE || atoi(before[L_ACTIVE]) == 0) return;