Don't try to do a get_user_account_by_login with a username longer than 8

[moira.git] / incremental / afs.c

diff --git a/incremental/afs.c b/incremental/afs.c
index 7d184205c9dc6a9c9faa0b2f0869ad8e79c7cb8d..ac881bd590245b2264a5dc99c3f03da2b78aef96 100644 (file)
--- a/incremental/afs.c
+++ b/incremental/afs.c
@@ -78,12 +78,13 @@ int argc;
     for (i = getdtablesize() - 1; i > 2; i--)
       close(i);
 
+    whoami = ((whoami = rindex(argv[0], '/')) ? whoami++ : 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);
 
@@ -102,7 +103,7 @@ int argc;
     }
     strcat(tbl_buf, ")");
 #ifdef DEBUG
-    printf("%s\n", tbl_buf);
+    com_err(whoami, 0, "%s", tbl_buf);
 #endif
 
     initialize_sms_error_table();
@@ -152,6 +153,9 @@ int afterc;
 
     if (astate == bstate) {
        /* Only a modify has to be done */
+       com_err(whoami, 0, "Changing user %s (uid %d) to %s (uid %d)",
+              before[U_NAME], buid, after[U_NAME], auid);
+
        code = pr_try(pr_ChangeEntry, before[U_NAME], after[U_NAME], auid, "");
        if (code) {
            critical_alert("incremental",
@@ -162,6 +166,9 @@ int afterc;
        return;
     }
     if (bstate == 1) {
+       com_err(whoami, 0, "Deleting user %s (uid %d)",
+              before[U_NAME], buid);
+
        code = pr_try(pr_DeleteByID, buid);
        if (code && code != PRNOENT) {
            critical_alert("incremental",
@@ -171,6 +178,10 @@ int afterc;
        return;
     }
     if (astate == 1) {
+       com_err(whoami, 0, "%s user %s (uid %d)",
+              ((bstate != 0) ? "Reactivating" : "Creating"),
+              after[U_NAME], auid);
+       
        code = pr_try(pr_CreateUser, after[U_NAME], &auid);
        if (code) {
            critical_alert("incremental",
@@ -235,6 +246,10 @@ int afterc;
            strcpy(g2, "system:");
            strcat(g1, before[L_NAME]);
            strcat(g2, after[L_NAME]);
+
+           com_err(whoami, 0, "Changing group %s (gid %d) to %s (gid %d)",
+                  before[L_NAME], bgid, after[L_NAME], agid);
+
            code = pr_try(pr_ChangeEntry, g1, g2, -agid, "");
            if (code) {
                critical_alert("incremental",
@@ -244,6 +259,9 @@ int afterc;
            }
        }
        if (ahide != bhide) {
+           com_err(whoami, 0, "Making group %s (gid %d) %s",
+                  after[L_NAME], agid,
+                  (ahide ? "hidden" : "visible"));
            code = pr_try(pr_SetFieldsEntry, -agid, PR_SF_ALLBITS,
                          (ahide ? PRP_STATUS_ANY : PRP_GROUP_DEFAULT) >>PRIVATE_SHIFT,
                          0 /*ngroups*/, 0 /*nusers*/);
@@ -256,6 +274,8 @@ int afterc;
        return;
     }
     if (bgid) {
+       com_err(whoami, 0, "Deleting group %s (gid %d)",
+              before[L_NAME], bgid);
        code = pr_try(pr_DeleteByID, -bgid);
        if (code && code != PRNOENT) {
            critical_alert("incremental",
@@ -269,6 +289,8 @@ int afterc;
        strcat(g1, after[L_NAME]);
        strcpy(g2, "system:administrators");
        id = -agid;
+       com_err(whoami, 0, "Creating %s group %s (gid %d)",
+              (ahide ? "hidden" : "visible"), after[L_NAME], agid);
        code = pr_try(pr_CreateGroup, g1, g2, &id);
        if (code) {
            critical_alert("incremental",
@@ -310,6 +332,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;
@@ -318,15 +349,27 @@ 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 (afterc < LM_EXTRA_END) {
+           if (!atoi(after[LM_EXTRA_GROUP])) 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 (beforec < LM_EXTRA_END) {
+           if (!atoi(before[LM_EXTRA_GROUP])) 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]);
+    }
 }
 
 
@@ -448,6 +491,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;
 }
 
 
@@ -457,6 +501,7 @@ add_list_members(ac, av, group)
     char *group;
 {
     edit_group(1, group, av[0], av[1]);
+    return 0;
 }
 
 
@@ -466,6 +511,7 @@ check_user(ac, av, ustate)
     int *ustate;
 {
     *ustate = atoi(av[U_STATE]);
+    return 0;
 }
 
 
@@ -514,6 +560,10 @@ edit_group(op, group, type, member)
 
     strcpy(buf, "system:");
     strcat(buf, group);
+    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 */
@@ -532,8 +582,15 @@ edit_group(op, group, type, member)
                               "Error contacting Moira server to lookup user %s: %s",
                               member, error_message(code));
            }
-           moira_disconnect();
+
+           /* We don't use moira_disconnect()
+            * because we may already be in the routine.
+            */
+           mr_disconnect();
+           mr_connections--;
+
            if (!code && ustate!=1 && ustate!=2) return; /* inactive user */
+           code = PRNOENT;
        }
 
        critical_alert("incremental",
@@ -557,7 +614,7 @@ long pr_try(fn, a1, a2, a3, a4, a5, a6, a7, a8)
 #endif
 
     check_afs();
-    
+
     if (initd) {
        code=pr_Initialize(0, AFSCONF_CLIENTNAME, 0);
     } else {
@@ -632,8 +689,12 @@ moira_connect()
     long code;
 
     if (!mr_connections++) {
+#ifdef DEBUG
+       code = mr_connect("moira");
+#else
        gethostname(hostname, sizeof(hostname));
        code = mr_connect(hostname);
+#endif
        if (!code) code = mr_auth("afs.incr");
        return code;    
     }
@@ -645,13 +706,12 @@ moira_disconnect()
     struct member *m;
     
     if (!--mr_connections) {
-       while(member_head) {
-           m = member_head;
+       mr_disconnect();
+       while(m = member_head) {
            edit_group(m->op, m->list, m->type, m->member);
            member_head = m->next;
            free(m);
        }
-       mr_disconnect();
     }
     return 0;
 }