.dc -> .pc

[moira.git] / incremental / afs.c

diff --git a/incremental/afs.c b/incremental/afs.c
index 6621637d66e8da6b1869fcefdea2ba789680a9dc..1e87b755065f24eea83b9bced5e9aba63286455f 100644 (file)
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -10,7 +10,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/file.h>
-#include <strings.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <krb.h>
 #include <moira.h>
@@ -25,10 +26,6 @@
 #define STOP_FILE "/moira/afs/noafs"
 #define file_exists(file) (access((file), F_OK) == 0)
 
-#if defined(vax) && !defined(__STDC__)
-#define volatile
-#endif
-
 char *whoami;
 
 /* Main stub routines */
@@ -44,7 +41,7 @@ int add_user_lists();
 int add_list_members();
 int check_user();
 int edit_group();
-int pr_try();
+long pr_try();
 int check_afs();
 
 /* libprot.a routines */
@@ -78,14 +75,15 @@ int argc;
     for (i = getdtablesize() - 1; i > 2; i--)
       close(i);
 
+    whoami = ((whoami = strrchr(argv[0], '/')) ? whoami+1 : argv[0]);
+
     table = argv[1];
     beforec = atoi(argv[2]);
     before = &argv[4];
     afterc = atoi(argv[3]);
     after = &argv[4 + beforec];
-    whoami = argv[0];
 
-    setlinebuf(stdout);
+    setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
 
     strcpy(tbl_buf, table);
     strcat(tbl_buf, " (");
@@ -112,7 +110,7 @@ int argc;
        do_user(before, beforec, after, afterc);
     } else if (!strcmp(table, "list")) {
        do_list(before, beforec, after, afterc);
-    } else if (!strcmp(table, "members")) {
+    } else if (!strcmp(table, "imembers")) {
        do_member(before, beforec, after, afterc);
     } else if (!strcmp(table, "filesys")) {
        do_filesys(before, beforec, after, afterc);
@@ -331,6 +329,15 @@ int afterc;
 }
 
 
+    
+#define LM_EXTRA_ACTIVE          (LM_END)
+#define LM_EXTRA_PUBLIC   (LM_END+1)
+#define LM_EXTRA_HIDDEN   (LM_END+2)
+#define LM_EXTRA_MAILLIST (LM_END+3)
+#define LM_EXTRA_GROUP    (LM_END+4)
+#define LM_EXTRA_GID      (LM_END+5)
+#define LM_EXTRA_END      (LM_END+6)
+
 do_member(before, beforec, after, afterc)
 char **before;
 int beforec;
@@ -339,15 +346,23 @@ int afterc;
 {
     int code;
     char *p;
-    
-    if ((beforec < 4 || !atoi(before[LM_END])) &&
-       (afterc < 4 || !atoi(after[LM_END])))
-       return;
 
-    if (afterc)
-       edit_group(1, after[LM_LIST], after[LM_TYPE], after[LM_MEMBER]);
-    if (beforec)
+    if (afterc) {
+       if (afterc < LM_EXTRA_END) {
+           return;
+       } else
+         if (!atoi(after[LM_EXTRA_ACTIVE]) || !atoi(after[LM_EXTRA_GROUP]))
+           return;
+       
+       edit_group(1, after[LM_LIST], after[LM_TYPE], after[LM_MEMBER]);
+    } else if (beforec) {
+       if (beforec < LM_EXTRA_END) {
+           return;
+       } else
+         if (!atoi(before[LM_EXTRA_ACTIVE]) || !atoi(before[LM_EXTRA_GROUP]))
+           return;
        edit_group(0, before[LM_LIST], before[LM_TYPE], before[LM_MEMBER]);
+    }
 }
 
 
@@ -469,6 +484,7 @@ add_user_lists(ac, av, user)
 {
     if (atoi(av[L_ACTIVE]) && atoi(av[L_GROUP]))       /* active group ? */
        edit_group(1, av[L_NAME], "USER", user);
+    return 0;
 }
 
 
@@ -478,6 +494,7 @@ add_list_members(ac, av, group)
     char *group;
 {
     edit_group(1, group, av[0], av[1]);
+    return 0;
 }
 
 
@@ -487,6 +504,7 @@ check_user(ac, av, ustate)
     int *ustate;
 {
     *ustate = atoi(av[U_STATE]);
+    return 0;
 }
 
 
@@ -508,7 +526,7 @@ edit_group(op, group, type, member)
     if (!local_realm[0])
        krb_get_lrealm(local_realm, 1);
     if (!strcmp(type, "KERBEROS")) {
-       p = index(member, '@');
+       p = strchr(member, '@');
        if (p && !strcasecmp(p+1, local_realm))
            *p = 0;
     } else if (strcmp(type, "USER"))
@@ -538,6 +556,7 @@ edit_group(op, group, type, member)
     com_err(whoami, 0, "%s %s %s group %s",
           (op ? "Adding" : "Removing"), member,
           (op ? "to" : "from"), group);
+    code = 0;
     code=pr_try(op ? pr_AddToGroup : pr_RemoveUserFromGroup, member, buf);
     if (code) {
        if (op==1 && code == PRIDEXIST) return; /* Already added */
@@ -581,14 +600,14 @@ long pr_try(fn, a1, a2, a3, a4, a5, a6, a7, a8)
     char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
 {
     static int initd=0;
-    volatile register long code;
+    register long code;
     register int tries = 0;
 #ifdef DEBUG
     char fname[64];
 #endif
 
     check_afs();
-    
+
     if (initd) {
        code=pr_Initialize(0, AFSCONF_CLIENTNAME, 0);
     } else {