X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/daf931761dae2e03943fc56119846e89a5be99a3..bd70a79d404413d70df71d89beae2d30567574e9:/incremental/afs.c

diff --git a/incremental/afs.c b/incremental/afs.c
index 85da8d26..eb4ce1d5 100644
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -7,13 +7,13 @@
  * <mit-copyright.h>.
  */
 
-#include <sms.h>
-#include <sms_app.h>
+#include <moira.h>
+#include <moira_site.h>
 #include <sys/file.h>
 
 #define file_exists(file) (access((file), F_OK) == 0)
 
-char prs[64], fs[64];
+char pts[64], fs[64];
 
 char *whoami;
 
@@ -56,7 +56,7 @@ int argc;
 
     initialize_sms_error_table();
     initialize_krb_error_table();
-    sprintf(prs, "%s/prs", BIN_DIR);
+    sprintf(pts, "%s/pts", BIN_DIR);
     sprintf(fs, "%s/fs", BIN_DIR);
 
     if (!strcmp(table, "users")) {
@@ -67,7 +67,7 @@ int argc;
 	do_member(before, beforec, after, afterc);
     } else if (!strcmp(table, "filesys")) {
 	do_filesys(before, beforec, after, afterc);
-    } else if (!strcmp(table, "nfsquota")) {
+    } else if (!strcmp(table, "quota")) {
 	do_quota(before, beforec, after, afterc);
     }
     exit(0);
@@ -113,12 +113,12 @@ int afterc;
     if (astate != 1 && bstate != 1)
       return;
     if (astate == 1 && bstate != 1) {
-	sprintf(cmd, "%s newuser -name %s -id %s",
-		prs, after[U_NAME], after[U_UID]);
+	sprintf(cmd, "%s createuser -name %s -id %s",
+		pts, after[U_NAME], after[U_UID]);
 	do_cmd(cmd);
 	return;
     } else if (astate != 1 && bstate == 1) {
-	sprintf(cmd, "%s delete %s", prs, before[U_NAME]);
+	sprintf(cmd, "%s delete -name %s", pts, before[U_NAME]);
 	do_cmd(cmd);
 	return;
     }
@@ -131,8 +131,8 @@ int afterc;
 
     if (beforec > U_NAME && afterc > U_NAME &&
 	strcmp(before[U_NAME], after[U_NAME])) {
-	sprintf(cmd, "%s chname -oldname %s -newname %s",
-		prs, before[U_NAME], after[U_NAME]);
+	sprintf(cmd, "%s rename -oldname %s -newname %s",
+		pts, before[U_NAME], after[U_NAME]);
 	do_cmd(cmd);
     }
 }
@@ -156,13 +156,13 @@ int afterc;
 
     if (bgid == 0 && agid != 0) {
 	sprintf(cmd,
-		"%s create -name system:%s -id %s -owner system:administrators",
-		prs, after[L_NAME], after[L_GID]);
+		"%s creategroup -name system:%s -owner system:administrators -id -%s",
+		pts, after[L_NAME], after[L_GID]);
 	do_cmd(cmd);
 	return;
     }
     if (agid == 0 && bgid != 0) {
-	sprintf(cmd, "%s delete -name system:%s", prs, before[L_NAME]);
+	sprintf(cmd, "%s delete -name system:%s", pts, before[L_NAME]);
 	do_cmd(cmd);
 	return;
     }
@@ -170,8 +170,8 @@ int afterc;
       return;
     if (strcmp(before[L_NAME], after[L_NAME])) {
 	sprintf(cmd,
-		"%s chname -oldname system:%s -newname system:%s",
-		prs, before[L_NAME], after[L_NAME]);
+		"%s rename -oldname system:%s -newname system:%s",
+		pts, before[L_NAME], after[L_NAME]);
 	do_cmd(cmd);
 	return;
     }
@@ -186,15 +186,18 @@ int afterc;
 {
     char cmd[512];
 
+    if ((beforec < 4 || !atoi(before[LM_END])) &&
+	(afterc < 4 || !atoi(after[LM_END])))
+      return;
     if (beforec == 0 && !strcmp(after[LM_TYPE], "USER")) {
-	sprintf(cmd, "%s add -user %s -group system:%s",
-		prs, after[LM_MEMBER], after[LM_LIST]);
+	sprintf(cmd, "%s adduser -user %s -group system:%s",
+		pts, after[LM_MEMBER], after[LM_LIST]);
 	do_cmd(cmd);
 	return;
     }
     if (afterc == 0 && !strcmp(before[LM_TYPE], "USER")) {
-	sprintf(cmd, "%s remove -user %s -group system:%s",
-		prs, before[LM_MEMBER], before[LM_LIST]);
+	sprintf(cmd, "%s removeuser -user %s -group system:%s",
+		pts, before[LM_MEMBER], before[LM_LIST]);
 	do_cmd(cmd);
 	return;
     }
@@ -227,15 +230,12 @@ int afterc;
 {
     char cmd[512];
 
-    if (!(afterc >= Q_DIRECTORY && !strncmp("/afs", after[Q_DIRECTORY], 4)) &&
-	!(beforec >= Q_DIRECTORY && !strncmp("/afs", before[Q_DIRECTORY], 4)))
-      return;
-    if (afterc >= Q_LOGIN && strcmp("\\[nobody\\]", after[Q_LOGIN]))
+    if (afterc < Q_DIRECTORY || strcmp("ANY", after[Q_TYPE]) ||
+	strncmp("/afs", after[Q_DIRECTORY], 4))
       return;
-    if (afterc != 0) {
-	sprintf(cmd, "%s setquota -dir %s -quota %s",
-		fs, after[Q_DIRECTORY], after[Q_QUOTA]);
-	do_cmd(cmd);
-	return;
-    }
+
+    sprintf(cmd, "%s setquota -dir %s -max %s", fs,
+	    after[Q_DIRECTORY], after[Q_QUOTA]);
+    do_cmd(cmd);
+    return;
 }