]> andersk Git - moira.git/blobdiff - clients/blanche/blanche.c
Change the order we process adds and deletes in; fixes unintuitive
[moira.git] / clients / blanche / blanche.c
index 461c8998d6a9f04c774db615914729689aae05c6..4f7ba0d4eb1b32a9e06f39d8a286dbb74aa05465 100644 (file)
@@ -1,33 +1,30 @@
-/* $Header$
+/* $Id$
  *
- * Command line oriented SMS List tool.
+ * Command line oriented Moira List tool.
  *
  * by Mark Rosenstein, September 1988.
  *
- * Copyright 1989 by the Massachusetts Institute of Technology.
- *
- * (c) Copyright 1988 by the Massachusetts Institute of Technology.
+ * Copyright (C) 1988-1998 by the Massachusetts Institute of Technology.
  * For copying and distribution information, please see the file
  * <mit-copyright.h>.
  */
 
-/* ### Aren't there a lot of sq abstraction barrier violations here?
-   Do we need to improve the support for queue operations? */
-
 #include <mit-copyright.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <sms.h>
-#include <sms_app.h>
+#include <moira.h>
+#include <moira_site.h>
+#include <mrclient.h>
 
-#ifndef LINT
-static char smslist_rcsid[] = "$Header$";
-#endif
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
+RCSID("$Header$");
 
 struct member {
-    int type;
-    char *name;
+  int type;
+  char *name, *tag;
 };
 
 /* It is important to membercmp that M_USER < M_LIST < M_STRING */
@@ -35,538 +32,1451 @@ struct member {
 #define M_USER         1
 #define M_LIST         2
 #define M_STRING       3
+#define M_KERBEROS     4
+#define M_MACHINE       5
+#define M_NONE         6
+
+char *typename[] = { "ANY", "USER", "LIST", "STRING", "KERBEROS", "MACHINE",
+                    "NONE" };
 
 /* argument parsing macro */
-#define argis(a,b) ((strcmp(*arg+1, a) == 0) || (strcmp(*arg+1, b) == 0))
+#define argis(a, b) (!strcmp(*arg + 1, a) || !strcmp(*arg + 1, b))
 
 /* flags from command line */
-int infoflg, verbose, syncflg, memberflg, recursflg, debugflg;
+int infoflg, verbose, syncflg, memberflg, recursflg, noauth;
+int showusers, showstrings, showkerberos, showlists, showtags, showmachines;
+int createflag, setinfo, active, public, hidden, maillist, grouplist;
+int nfsgroup, mailman;
+struct member *owner, *memacl;
+char *desc, *newname, *mailman_server, *gid;
 
 /* various member lists */
-struct save_queue *addlist, *dellist, *memberlist, *synclist;
+struct save_queue *addlist, *dellist, *memberlist, *synclist, *taglist;
 
 char *listname, *whoami;
 
-extern char *index();
-extern int errno;
+void usage(char **argv);
+void show_list_member(struct member *memberstruct);
+int show_list_info(int argc, char **argv, void *hint);
+int save_list_info(int argc, char **argv, void *hint);
+int show_list_count(int argc, char **argv, void *hint);
+void recursive_display_list_members(void);
+void unique_add_member(struct save_queue *q, struct member *m);
+int get_list_members(int argc, char **argv, void *sq);
+void get_members_from_file(char *filename, struct save_queue *queue);
+int collect(int argc, char **argv, void *l);
+struct member *parse_member(char *s);
+int membercmp(const void *mem1, const void *mem2);
+int sq_count_elts(struct save_queue *q);
+char *get_username(void);
+
+int main(int argc, char **argv)
+{
+  int status, success;
+  char **arg = argv;
+  char *membervec[4];
+  struct member *memberstruct;
+  char *server = NULL, *p;
+
+  /* clear all flags & lists */
+  infoflg = verbose = syncflg = memberflg = recursflg = 0;
+  noauth = showusers = showstrings = showkerberos = showlists = 0;
+  showtags = showmachines = createflag = setinfo = 0;
+  active = public = hidden = maillist = grouplist = nfsgroup = mailman = -1;
+  listname = newname = desc = gid = NULL;
+  owner = NULL;
+  memacl = NULL;
+  addlist = sq_create();
+  dellist = sq_create();
+  memberlist = sq_create();
+  synclist = sq_create();
+  taglist = sq_create();
+  whoami = argv[0];
+
+  success = 1;
+
+  /* parse args, building addlist, dellist, & synclist */
+  while (++arg - argv < argc)
+    {
+      if (**arg == '-')
+       {
+         if (argis("m", "members"))
+           memberflg++;
+         else if (argis("u", "users"))
+           showusers++;
+         else if (argis("s", "strings"))
+           showstrings++;
+         else if (argis("l", "lists"))
+           showlists++;
+         else if (argis("k", "kerberos"))
+           showkerberos++;
+         else if (argis("t", "tags"))
+           showtags++;
+         else if (argis("i", "info"))
+           infoflg++;
+         else if (argis("n", "noauth"))
+           noauth++;
+         else if (argis("v", "verbose"))
+           verbose++;
+         else if (argis("r", "recursive"))
+           recursflg++;
+         else if (argis("S", "server") || argis("db", "database"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 ++arg;
+                 server = *arg;
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("a", "add"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 ++arg;
+                 if ((memberstruct = parse_member(*arg)))
+                   sq_save_data(addlist, memberstruct);
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("at", "addtagged"))
+           {
+             if (arg - argv < argc - 2)
+               {
+                 ++arg;
+                 if ((memberstruct = parse_member(*arg)))
+                   sq_save_data(addlist, memberstruct);
+                 memberstruct->tag = *++arg;
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("al", "addlist"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 ++arg;
+                 get_members_from_file(*arg, addlist);
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("d", "delete"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 ++arg;
+                 if ((memberstruct = parse_member(*arg)))
+                   sq_save_data(dellist, memberstruct);
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("dl", "deletelist"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 ++arg;
+                 get_members_from_file(*arg, dellist);
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("f", "file"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 syncflg++;
+                 ++arg;
+                 get_members_from_file(*arg, synclist);
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("ct", "changetag"))
+           {
+             if (arg - argv < argc - 2)
+               {
+                 ++arg;
+                 if ((memberstruct = parse_member(*arg)))
+                   sq_save_data(taglist, memberstruct);
+                 memberstruct->tag = *++arg;
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("C", "create"))
+           createflag++;
+         else if (argis("P", "public"))
+           {
+             setinfo++;
+             public = 1;
+           }
+         else if (argis("NP", "private"))
+           {
+             setinfo++;
+             public = 0;
+           }
+         else if (argis("A", "active"))
+           {
+             setinfo++;
+             active = 1;
+           }
+         else if (argis("I", "inactive"))
+           {
+             setinfo++;
+             active = 0;
+           }
+         else if (argis("V", "visible"))
+           {
+             setinfo++;
+             hidden = 0;
+           }
+         else if (argis("H", "hidden"))
+           {
+             setinfo++;
+             hidden = 1;
+           }
+         else if (argis("M", "mail"))
+           {
+             setinfo++;
+             maillist = 1;
+           }
+         else if (argis("NM", "notmail"))
+           {
+             setinfo++;
+             maillist = 0;
+           }
+         else if (argis("G", "group"))
+           {
+             setinfo++;
+             grouplist = 1;
+           }
+         else if (argis("NG", "notgroup"))
+           {
+             setinfo++;
+             grouplist = 0;
+           }
+         else if (argis("N", "nfs"))
+           {
+             setinfo++;
+             nfsgroup = 1;
+           }
+         else if (argis("NN", "notnfs"))
+           {
+             setinfo++;
+             nfsgroup = 0;
+           }
+         else if (argis("mm", "mailman"))
+           {
+             setinfo++;
+             mailman = 1;
+           }
+         else if (argis("nmm", "notmailman"))
+           {
+             setinfo++;
+             mailman = 0;
+           }
+         else if (argis("ms", "mailman_server"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 setinfo++;
+                 ++arg;
+                 mailman_server = canonicalize_hostname(strdup(*arg));
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("D", "desc"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 setinfo++;
+                 ++arg;
+                 desc = *arg;
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("O", "owner"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 setinfo++;
+                 ++arg;
+                 owner = parse_member(*arg);
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("MA", "memacl"))
+           {
+             if (arg - argv < argc -1)
+               {
+                 setinfo++;
+                 ++arg;
+                 memacl = parse_member(*arg);
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("R", "rename"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 setinfo++;
+                 ++arg;
+                 newname = *arg;
+               }
+             else
+               usage(argv);
+           }
+         else if (argis("g", "gid"))
+           {
+             if (arg - argv < argc - 1)
+               {
+                 setinfo++;
+                 ++arg;
+                 gid = *arg;
+               }
+             else
+               usage(argv);
+           }
+         else
+           usage(argv);
+       }
+      else if (listname == NULL)
+       listname = *arg;
+      else
+       usage(argv);
+    }
+  if (listname == NULL)
+    usage(argv);
+
+  /* if no other options specified, turn on list members flag */
+  if (!(infoflg || syncflg || createflag || setinfo ||
+       addlist->q_next != addlist || dellist->q_next != dellist ||
+       taglist->q_next != taglist))
+    memberflg++;
+
+  /* If none of {users,strings,lists,kerberos,machines} specified, 
+     turn them all on */
+  if (!(showusers || showstrings || showlists || showkerberos || showmachines))
+    showusers = showstrings = showlists = showkerberos = showmachines = 1;
+
+  /* fire up Moira */
+  status = mrcl_connect(server, "blanche", 10, !noauth);
+  if (status == MRCL_AUTH_ERROR)
+    {
+      com_err(whoami, 0, "Authentication error while working on list %s",
+             listname);
+      com_err(whoami, 0, "Try the -noauth flag if you don't "
+             "need authentication.");
+    }
+  if (status)
+    exit(2);
+
+  /* check for username/listname clash */
+  if (createflag || (setinfo && newname && strcmp(newname, listname)))
+    {
+      status = mr_query("get_user_account_by_login", 1,
+                       createflag ? &listname : &newname,
+                       NULL, NULL);
+      if (status != MR_NO_MATCH)
+       fprintf(stderr, "WARNING: A user by that name already exists.\n");
+    }
 
-int show_list_info(), show_list_count(), get_list_members(), scream();
-int show_list_members();
-struct member *parse_member();
+  /* create if needed */
+  if (createflag)
+    {
+      char *argv[13];
+
+      argv[L_NAME] = listname;
+      argv[L_ACTIVE] = (active == 0) ? "0" : "1";
+      argv[L_PUBLIC] = (public == 1) ? "1" : "0";
+      argv[L_HIDDEN] = (hidden == 1) ? "1" : "0";
+      argv[L_MAILLIST] = (maillist == 0) ? "0" : "1";
+      argv[L_GROUP] = (grouplist == 1) ? "1" : "0";
+
+      if (gid)
+       argv[L_GID] = gid;
+      else
+       argv[L_GID] = UNIQUE_GID;
+
+      argv[L_NFSGROUP] = (nfsgroup == 1) ? "1" : "0";
+      argv[L_MAILMAN] = (mailman == 1) ? "1" : "0";
+      argv[L_DESC] = desc ? desc : "none";
+
+      if (mailman)
+       argv[L_MAILMAN_SERVER] = mailman_server ? mailman_server : "[ANY]";
+      else
+       argv[L_MAILMAN_SERVER] = "[NONE]";
+
+      if (memacl)
+       {
+         if (memacl->type == M_ANY)
+           {
+             status = mr_query("get_user_account_by_login", 1,
+                               &memacl->name, NULL, NULL);
+             if (status == MR_NO_MATCH)
+               memacl->type = M_LIST;
+             else
+               memacl->type = M_USER;
+           }
+         argv[L_MEMACE_TYPE] = typename[memacl->type];
+         argv[L_MEMACE_NAME] = memacl->name;
+         if (memacl->type == M_KERBEROS)
+           {
+             status = mrcl_validate_kerberos_member(argv[L_MEMACE_NAME],
+                                                    &argv[L_MEMACE_NAME]);
+             if (mrcl_get_message())
+               mrcl_com_err(whoami);
+             if (status == MRCL_REJECT)
+               exit(1);
+           }
+       }
+      else 
+       argv[L_MEMACE_TYPE] = argv[L_MEMACE_NAME] = "NONE";
 
+      if (owner)
+       {
+         argv[L_ACE_NAME] = owner->name;
+         switch (owner->type)
+           {
+           case M_ANY:
+           case M_USER:
+             argv[L_ACE_TYPE] = "USER";
+             status = mr_query("add_list", 15, argv, NULL, NULL);
+             if (owner->type != M_ANY || status != MR_USER)
+               break;
 
+           case M_LIST:
+             argv[L_ACE_TYPE] = "LIST";
+             status = mr_query("add_list", 15, argv, NULL, NULL);
+             break;
 
-main(argc, argv)
-int argc;
-char **argv;
-{
-    int status;
-    char **arg = argv;
-    char *membervec[3];
-    struct member *memberstruct;
-
-    /* clear all flags & lists */
-    infoflg = verbose = syncflg = memberflg = debugflg = recursflg = 0;
-    listname = NULL;
-    addlist = sq_create();
-    dellist = sq_create();
-    memberlist = sq_create();
-    synclist = sq_create();
-    whoami = argv[0];
-
-    /* parse args, building addlist, dellist, & synclist */
-    while (++arg - argv < argc) {
-       if  (**arg == '-')
+           case M_KERBEROS:
+             argv[L_ACE_TYPE] = "KERBEROS";
+             status = mrcl_validate_kerberos_member(argv[L_ACE_NAME], 
+                                                    &argv[L_ACE_NAME]);
+             if (mrcl_get_message())
+               mrcl_com_err(whoami);
+             if (status == MRCL_REJECT)
+               exit(1);
+             status = mr_query("add_list", 15, argv, NULL, NULL);
+             break;
+           case M_NONE:
+             argv[L_ACE_TYPE] = argv[L_ACE_NAME] = "NONE";
+             status = mr_query("add_list", 15, argv, NULL, NULL);
+             break;
+           }
+       }
+      else
        {
-           if (argis("m", "members"))
-               memberflg++;
-           else if (argis("D", "debug"))
-               debugflg++;
-           else if (argis("i","information"))
-             infoflg++;
-           else if (argis("v","verbose"))
-             verbose++;
-           else if (argis("r","recursive"))
-             recursflg++;
-           else if (argis("a","add"))
-               if (arg - argv < argc - 1) {
-                   ++arg;
-                   if (memberstruct = parse_member(*arg))
-                       sq_save_data(addlist, memberstruct);
-               } else
-                   usage(argv);
-           else if (argis("d","delete"))
-               if (arg - argv < argc - 1) {
-                   ++arg;
-                   if (memberstruct = parse_member(*arg))
-                       sq_save_data(dellist, memberstruct);
-               } else
-                   usage(argv);
-           else if (argis("f","file"))
-               if (arg - argv < argc - 1) {
-                   FILE *in;
-                   char buf[BUFSIZ];
-
-                   syncflg++;
-                   ++arg;
-                   if (!strcmp(*arg, "-"))
-                     in = stdin;
-                   else {
-                       in = fopen(*arg, "r");
-                       if (!in) {
-                           com_err(whoami, errno, 
-                                   " while opening %s for input", *arg);
-                           exit(2);
-                       }
-                   }
-                   while (fgets(buf, BUFSIZ, in))
-                     if (memberstruct = parse_member(buf))
-                       sq_save_data(synclist, memberstruct);
-                   if (!feof(in))
-                     com_err(whoami, errno, " while reading from %s", *arg);
-               } else
-                 usage(argv);
-           else
-               usage(argv);
+         argv[L_ACE_TYPE] = "USER";
+         argv[L_ACE_NAME] = get_username();
+
+         status = mr_query("add_list", 15, argv, NULL, NULL);
+       }
+
+      if (status)
+       {
+         com_err(whoami, status, "while creating list.");
+         exit(1);
        }
-       else if (listname == NULL)
-         listname = *arg;
-       else
-         usage(argv);
-    }
-    if (listname == NULL)
-      usage(argv);
-
-    /* if no other options specified, turn on list members flag */
-    if (!(infoflg || syncflg ||
-         addlist->q_next != addlist || dellist->q_next != dellist))
-      memberflg++;
-
-    /* fire up SMS */
-    if (status = sms_connect()) {
-       com_err(whoami, status, " unable to connect to SMS");
-       exit(2);
     }
-    if (status = sms_auth("blanche")) {
-       com_err(whoami, status, " unable to authenticate to SMS");
-       exit(2);
+  else if (setinfo)
+    {
+      char *argv[14];
+
+      status = mr_query("get_list_info", 1, &listname,
+                       save_list_info, argv);
+      if (status)
+       {
+         com_err(whoami, status, "while getting list information");
+         exit(1);
+       }
+
+      argv[0] = listname;
+      if (newname)
+       argv[L_NAME + 1] = newname;
+      if (active != -1)
+       argv[L_ACTIVE + 1] = active ? "1" : "0";
+      if (public != -1)
+       argv[L_PUBLIC + 1] = public ? "1" : "0";
+      if (hidden != -1)
+       argv[L_HIDDEN + 1] = hidden ? "1" : "0";
+      if (maillist != -1)
+       argv[L_MAILLIST + 1] = maillist ? "1" : "0";
+      if (grouplist != -1)
+       argv[L_GROUP + 1] = grouplist ? "1" : "0";
+      if (gid)
+       argv[L_GID + 1] = gid;
+      if (nfsgroup != -1)
+       argv[L_NFSGROUP + 1] = nfsgroup ? "1" : "0";
+      if (mailman != -1)
+       argv[L_MAILMAN + 1] = mailman ? "1" : "0";
+
+      /* If someone toggled the mailman bit, but didn't specify a server,
+       * default to [ANY].
+       */
+      if (mailman_server)
+       argv[L_MAILMAN_SERVER + 1] = mailman_server;
+      else if ((mailman == 1) && !strcmp(argv[L_MAILMAN_SERVER + 1], "[NONE]"))
+       argv[L_MAILMAN_SERVER + 1] = "[ANY]";
+
+      if (desc)
+       argv[L_DESC + 1] = desc;
+
+      if (memacl)
+       {
+         if (memacl->type == M_ANY)
+           {
+             status = mr_query("get_user_account_by_login", 1,
+                               &memacl->name, NULL, NULL);
+             if (status == MR_NO_MATCH)
+               memacl->type = M_LIST;
+             else
+               memacl->type = M_USER;
+           }
+         argv[L_MEMACE_TYPE + 1] = typename[memacl->type];
+         argv[L_MEMACE_NAME + 1] = memacl->name;
+         if (memacl->type == M_KERBEROS)
+           {
+             status = mrcl_validate_kerberos_member(argv[L_MEMACE_NAME + 1],
+                                                    &argv[L_MEMACE_NAME + 1]);
+             if (mrcl_get_message())
+               mrcl_com_err(whoami);
+             if (status == MRCL_REJECT)
+               exit(1);
+           }
+       }
+
+      if (owner)
+       {
+         argv[L_ACE_NAME + 1] = owner->name;
+         switch (owner->type)
+           {
+           case M_ANY:
+           case M_USER:
+             argv[L_ACE_TYPE + 1] = "USER";
+             status = mr_query("update_list", 16, argv, NULL, NULL);
+             if (owner->type != M_ANY || status != MR_USER)
+               break;
+
+           case M_LIST:
+             argv[L_ACE_TYPE + 1] = "LIST";
+             status = mr_query("update_list", 16, argv, NULL, NULL);
+             break;
+
+           case M_KERBEROS:
+             argv[L_ACE_TYPE + 1] = "KERBEROS";
+             status = mrcl_validate_kerberos_member(argv[L_ACE_NAME + 1],
+                                                    &argv[L_ACE_NAME + 1]);
+             if (mrcl_get_message())
+               mrcl_com_err(whoami);
+             if (status == MRCL_REJECT)
+               exit(1);
+             status = mr_query("update_list", 16, argv, NULL, NULL);
+             break;
+           case M_NONE:
+             argv[L_ACE_TYPE + 1] = argv[L_ACE_NAME + 1] = "NONE";
+             status = mr_query("update_list", 16, argv, NULL, NULL);
+             break;
+           }
+       }
+      else
+       status = mr_query("update_list", 16, argv, NULL, NULL);
+
+      if (status)
+       {
+         com_err(whoami, status, "while updating list.");
+         success = 0;
+       }
+      else if (newname)
+       listname = newname;
     }
 
-    /* display list info if requested to */
-    if (infoflg) {
-       status = sms_query("get_list_info", 1, &listname, show_list_info,NULL);
-       if (status)
-         com_err(whoami, status, " while getting list information");
-       if (verbose && !memberflg) {
-           status = sms_query("count_members_of_list", 1, &listname,
-                              show_list_count, NULL);
-           if (status)
-             com_err(whoami, status, " while getting list count");
+  /* display list info if requested to */
+  if (infoflg)
+    {
+      status = mr_query("get_list_info", 1, &listname, show_list_info, NULL);
+      if (status)
+       {
+         com_err(whoami, status, "while getting list information");
+         success = 0;
+       }
+      if (verbose && !memberflg)
+       {
+         status = mr_query("count_members_of_list", 1, &listname,
+                           show_list_count, NULL);
+         if (status)
+           {
+             com_err(whoami, status, "while getting list count");
+             success = 0;
+           }
        }
     }
 
-    /* if we're synchronizing to a file, we need to:
-     *  get the current members of the list
-     * for each member of the sync file
-     *    if they are on the list, remove them from the in-memory copy
-     *    if they're not on the list, add them to add-list
-     * if anyone is left on the in-memory copy, put them on the delete-list
-     * lastly, reset memberlist so we can use it again later
-     */
-    if (syncflg) {
-       status = sms_query("get_members_of_list", 1, &listname,
-                          get_list_members, (char *)memberlist);
-       if (status)
-         com_err(whoami, status, " getting members of list %s", listname);
-       while (sq_get_data(synclist, &memberstruct)) {
-           struct save_queue *q;
-           int removed = 0;
-
-           for (q = memberlist->q_next; q != memberlist; q = q->q_next) {
-               if (membercmp(q->q_data, memberstruct) == 0) {
-                   q->q_prev->q_next = q->q_next;
-                   q->q_next->q_prev = q->q_prev;
-                   removed++;
-                   break;
+  /* if we're synchronizing to a file, we need to:
+   *  get the current members of the list
+   *   for each member of the sync file
+   *      if they are on the list, remove them from the in-memory copy
+   *      if they're not on the list, add them to add-list
+   *   if anyone is left on the in-memory copy, put them on the delete-list
+   * lastly, reset memberlist so we can use it again later
+   */
+  if (syncflg)
+    {
+      status = mr_query("get_members_of_list", 1, &listname,
+                       get_list_members, memberlist);
+      if (status)
+       {
+         com_err(whoami, status, "getting members of list %s", listname);
+         exit(2);
+       }
+      while (sq_get_data(synclist, &memberstruct))
+       {
+         struct save_queue *q;
+         int removed = 0;
+
+         for (q = memberlist->q_next; q != memberlist; q = q->q_next)
+           {
+             if (membercmp(q->q_data, memberstruct) == 0)
+               {
+                 q->q_prev->q_next = q->q_next;
+                 q->q_next->q_prev = q->q_prev;
+                 removed++;
+                 break;
                }
            }
-           if (!removed)
-             sq_save_data(addlist, memberstruct);
+         if (!removed)
+           sq_save_data(addlist, memberstruct);
        }
-       while (sq_get_data(memberlist, &memberstruct))
-         sq_save_data(dellist, memberstruct);
-       sq_destroy(memberlist);
-       memberlist = sq_create();
+      while (sq_get_data(memberlist, &memberstruct))
+       sq_save_data(dellist, memberstruct);
+      sq_destroy(memberlist);
+      memberlist = sq_create();
     }
 
-    /* Process the add list */
-    while (sq_get_data(addlist, &memberstruct)) {
-       membervec[0] = listname;
-       membervec[2] = memberstruct->name;
-       if (verbose && syncflg) {
-           printf("Adding member ");
-           show_list_member(memberstruct);
+  /* Process the delete list */
+  while (sq_get_data(dellist, &memberstruct))
+    {
+      membervec[0] = listname;
+      membervec[2] = memberstruct->name;
+      if (verbose)
+        {
+          printf("Deleting member ");
+          show_list_member(memberstruct);
+        }
+      switch (memberstruct->type)
+        {
+        case M_ANY:
+        case M_USER:
+          membervec[1] = "USER";
+          status = mr_query("delete_member_from_list", 3, membervec,
+                            NULL, NULL);
+          if (status == MR_SUCCESS)
+            break;
+          else if ((status != MR_USER && status != MR_NO_MATCH) ||
+                   memberstruct->type != M_ANY)
+            {
+              com_err(whoami, status, "while deleting member %s from %s",
+                      memberstruct->name, listname);
+              success = 0;
+              break;
+            }
+        case M_LIST:
+          membervec[1] = "LIST";
+          status = mr_query("delete_member_from_list", 3, membervec,
+                            NULL, NULL);
+          if (status == MR_SUCCESS)
+            break;
+          else if ((status != MR_LIST && status != MR_NO_MATCH) ||
+                   memberstruct->type != M_ANY)
+            {
+              if (status == MR_PERM && memberstruct->type == M_ANY &&
+                  !strcmp(membervec[2], get_username()))
+                {
+                 /* M_ANY means we've fallen through from the user
+                   * case. The user is trying to remove himself from a
+                   * list, but we got MR_USER or MR_NO_MATCH above,
+                   * meaning he's not really on it, and we got MR_PERM
+                   * when trying to remove LIST:$USER because he's not
+                   * on the acl. That error is useless, so return
+                   * MR_NO_MATCH instead. However, this will generate
+                   * the wrong error if the user was trying to remove
+                   * the list with his username from a list he doesn't
+                   * administrate without explicitly specifying
+                   * "list:".
+                   */
+                  status = MR_NO_MATCH;
+                }
+              com_err(whoami, status, "while deleting member %s from %s",
+                      memberstruct->name, listname);
+              success = 0;
+              break;
+            }
+        case M_STRING:
+          membervec[1] = "STRING";
+          status = mr_query("delete_member_from_list", 3, membervec,
+                            NULL, NULL);
+          if (status == MR_STRING && memberstruct->type == M_ANY)
+            {
+              com_err(whoami, 0, " Unable to find member %s to delete from %s",
+                      memberstruct->name, listname);
+              success = 0;
+              if (!strcmp(membervec[0], get_username()))
+                {
+                  fprintf(stderr, "(If you were trying to remove yourself "
+                          "from the list \"%s\",\n", membervec[2]);
+                  fprintf(stderr, "the correct command is \"blanche %s -d "
+                          "%s\".)\n", membervec[2], membervec[0]);
+                }
+            }
+          else if (status != MR_SUCCESS)
+            {
+              com_err(whoami, status, "while deleting member %s from %s",
+                      memberstruct->name, listname);
+              success = 0;
+            }
+          break;
+        case M_KERBEROS:
+          membervec[1] = "KERBEROS";
+          status = mr_query("delete_member_from_list", 3, membervec,
+                            NULL, NULL);
+          if (status == MR_STRING || status == MR_NO_MATCH)
+            {
+              /* Try canonicalizing the Kerberos principal and trying
+               * again.  If we succeed, print the message from mrcl.
+               * Otherwise, just pretend we never did this and print
+               * the original error message.
+               */
+              mrcl_validate_kerberos_member(membervec[2], &membervec[2]);
+              if (mrcl_get_message())
+                {
+                  if (mr_query("delete_member_from_list", 3, membervec,
+                               NULL, NULL) == MR_SUCCESS)
+                    mrcl_com_err(whoami);
+                  status = MR_SUCCESS;
+                }
+            }
+          if (status != MR_SUCCESS)
+            {
+              com_err(whoami, status, "while deleting member %s from %s",
+                      memberstruct->name, listname);
+              success = 0;
+            }
+          break;
+        case M_MACHINE:
+          membervec[1] = "MACHINE";
+          membervec[2] = canonicalize_hostname(memberstruct->name);
+          status = mr_query("delete_member_from_list", 3, membervec,
+                            NULL, NULL);
+          if (status != MR_SUCCESS)
+            {
+              com_err(whoami, status, "while deleting member %s from %s",
+                      memberstruct->name, listname);
+              success = 0;
+            }
+          free(membervec[2]);
+        }
+    }
+
+  /* Process the add list */
+  while (sq_get_data(addlist, &memberstruct))
+    {
+      /* canonicalize string if necessary */
+      if (memberstruct->type != M_KERBEROS &&
+         (p = strchr(memberstruct->name, '@')))
+       {
+         char *host = canonicalize_hostname(strdup(++p));
+         static char **mailhubs = NULL;
+         char *argv[4];
+         int i;
+
+         if (!mailhubs)
+           {
+             argv[0] = "mailhub";
+             argv[1] = "TYPE";
+             argv[2] = "*";
+             mailhubs = malloc(sizeof(char *));
+             mailhubs[0] = NULL;
+             status = mr_query("get_alias", 3, argv, collect,
+                               &mailhubs);
+             if (status != MR_SUCCESS && status != MR_NO_MATCH)
+               {
+                 com_err(whoami, status,
+                         " while reading list of MAILHUB servers");
+                 mailhubs[0] = NULL;
+               }
+           }
+         for (i = 0; (p = mailhubs[i]); i++)
+           {
+             if (!strcasecmp(p, host))
+               {
+                 host = strdup(memberstruct->name);
+                 *(strchr(memberstruct->name, '@')) = 0;
+                 if (memberstruct->type == M_STRING)
+                     memberstruct->type = M_ANY;
+                 fprintf(stderr, "Warning: \"%s\" converted to "
+                         "\"%s\" because it is a local name.\n",
+                         host, memberstruct->name);
+                 break;
+               }
+           }
+         free(host);
+       }
+      /* now continue adding member */
+      membervec[0] = listname;
+      membervec[2] = memberstruct->name;
+      membervec[3] = memberstruct->tag;
+      if (verbose)
+       {
+         printf("Adding member ");
+         show_list_member(memberstruct);
        }
-       switch (memberstruct->type) {
+      switch (memberstruct->type)
+       {
        case M_ANY:
        case M_USER:
-           membervec[1] = "USER";
-           status = sms_query("add_member_to_list", 3, membervec, scream, NULL);
-           if (status == SMS_SUCCESS)
+         membervec[1] = "USER";
+         status = mr_query("add_tagged_member_to_list", 4, membervec,
+                           NULL, NULL);
+         if (status == MR_SUCCESS)
+           break;
+         else if (status != MR_USER || memberstruct->type != M_ANY)
+           {
+             com_err(whoami, status, "while adding member %s to %s",
+                     memberstruct->name, listname);
+             success = 0;
              break;
-           else if (status != SMS_USER || memberstruct->type != M_ANY) {
-               com_err(whoami, status, " while adding member %s to %s",
-                       memberstruct->name, listname);
-               break;
            }
        case M_LIST:
-           membervec[1] = "LIST";
-           status = sms_query("add_member_to_list", 3, membervec,
-                              scream, NULL);
-           if (status == SMS_SUCCESS)
+         membervec[1] = "LIST";
+         status = mr_query("add_tagged_member_to_list", 4, membervec,
+                           NULL, NULL);
+         if (status == MR_SUCCESS)
+           {
+             if (!strcmp(membervec[0], get_username()))
+               {
+                 fprintf(stderr, "\nWARNING: \"LIST:%s\" was just added "
+                         "to list \"%s\".\n", membervec[2], membervec[0]);
+                 fprintf(stderr, "If you meant to add yourself to the list "
+                         "\"%s\", type:\n", membervec[2]);
+                 fprintf(stderr, "\tblanche %s -d %s\t(to undo this)\n",
+                         membervec[0], membervec[2]);
+                 fprintf(stderr, "\tblanche %s -a %s\t(to add yourself to "
+                         "that list)\n", membervec[2], membervec[0]);
+               }
+             break;
+           }
+         else if (status != MR_LIST || memberstruct->type != M_ANY)
+           {
+             com_err(whoami, status, "while adding member %s to %s",
+                     memberstruct->name, listname);
+             success = 0;
              break;
-           else if (status != SMS_LIST || memberstruct->type != M_ANY) {
-               com_err(whoami, status, " while adding member %s to %s",
-                       memberstruct->name, listname);
-               break;
            }
        case M_STRING:
-           membervec[1] = "STRING";
-           status = sms_query("add_member_to_list", 3, membervec,
-                              scream, NULL);
-           if (status != SMS_SUCCESS)
-             com_err(whoami, status, " while adding member %s to %s",
+         status = mrcl_validate_string_member(memberstruct->name);
+         if (memberstruct->type == M_ANY && status == MRCL_WARN)
+           {
+             /* if user is trying to add something which isn't a
+                remote string, or a list, or a user, and didn't
+                explicitly specify `STRING:', it's probably a typo */
+             com_err(whoami, MR_NO_MATCH, "while adding member %s to %s",
+                     memberstruct->name, listname);
+             success = 0;
+             break;
+           }
+         else
+           mrcl_com_err(whoami);
+
+         if (status == MRCL_REJECT)
+           {
+             success = 0;
+             break;
+           }
+
+         membervec[1] = "STRING";
+         status = mr_query("add_tagged_member_to_list", 4, membervec,
+                           NULL, NULL);
+         if (status != MR_SUCCESS)
+           {
+             com_err(whoami, status, "while adding member %s to %s",
+                     memberstruct->name, listname);
+             success = 0;
+           }
+         break;
+       case M_KERBEROS:
+         membervec[1] = "KERBEROS";
+         status = mrcl_validate_kerberos_member(membervec[2], &membervec[2]);
+         if (mrcl_get_message())
+           mrcl_com_err(whoami);
+         if (status == MRCL_REJECT)
+           {
+             success = 0;
+             break;
+           }
+         status = mr_query("add_tagged_member_to_list", 4, membervec,
+                           NULL, NULL);
+         if (status != MR_SUCCESS)
+           {
+             com_err(whoami, status, "while adding member %s to %s",
                      memberstruct->name, listname);
+             success = 0;
+           }
+         free(membervec[2]);
+         break;
+       case M_MACHINE:
+         membervec[1] = "MACHINE";
+         membervec[2] = canonicalize_hostname(strdup(memberstruct->name));
+         status = mr_query("add_tagged_member_to_list", 4, membervec,
+                           NULL, NULL);
+         if (status != MR_SUCCESS)
+           {
+             com_err(whoami, status, "while adding member %s to %s",
+                     memberstruct->name, listname);
+             success = 0;
+           }
+         free(membervec[2]);
        }
     }
 
-    /* Process the delete list */
-    while (sq_get_data(dellist, &memberstruct)) {
-       membervec[0] = listname;
-       membervec[2] = memberstruct->name;
-       if (verbose && syncflg) {
-           printf("Deleting member ");
-           show_list_member(memberstruct);
+  /* Process the tag list */
+  while (sq_get_data(taglist, &memberstruct))
+    {
+      membervec[0] = listname;
+      membervec[2] = memberstruct->name;
+      membervec[3] = memberstruct->tag;
+      if (verbose)
+       {
+         printf("Tagging member ");
+         show_list_member(memberstruct);
        }
-       switch (memberstruct->type) {
+      switch (memberstruct->type)
+       {
        case M_ANY:
        case M_USER:
-           membervec[1] = "USER";
-           status = sms_query("delete_member_from_list", 3, membervec,
-                              scream, NULL);
-           if (status == SMS_SUCCESS)
+         membervec[1] = "USER";
+         status = mr_query("tag_member_of_list", 4, membervec,
+                           NULL, NULL);
+         if (status == MR_SUCCESS)
+           break;
+         else if ((status != MR_USER && status != MR_NO_MATCH) ||
+                  memberstruct->type != M_ANY)
+           {
+             com_err(whoami, status, "while changing tag on member %s of %s",
+                     memberstruct->name, listname);
+             success = 0;
              break;
-           else if ((status != SMS_USER && status != SMS_NO_MATCH) ||
-                    memberstruct->type != M_ANY) {
-               com_err(whoami, status, " while deleteing member %s from %s",
-                       memberstruct->name, listname);
-               break;
            }
        case M_LIST:
-           membervec[1] = "LIST";
-           status = sms_query("delete_member_from_list", 3, membervec,
-                              scream, NULL);
-           if (status == SMS_SUCCESS)
+         membervec[1] = "LIST";
+         status = mr_query("tag_member_of_list", 4, membervec,
+                           NULL, NULL);
+         if (status == MR_SUCCESS)
+           break;
+         else if ((status != MR_LIST && status != MR_NO_MATCH) ||
+                  memberstruct->type != M_ANY)
+           {
+             com_err(whoami, status, "while changing tag on member %s of %s",
+                     memberstruct->name, listname);
+             success = 0;
              break;
-           else if ((status != SMS_LIST && status != SMS_NO_MATCH) ||
-                    memberstruct->type != M_ANY) {
-               com_err(whoami, status, " while deleteing member %s from %s",
-                       memberstruct->name, listname);
-               break;
            }
        case M_STRING:
-           membervec[1] = "STRING";
-           status = sms_query("delete_member_from_list", 3, membervec,
-                              scream, NULL);
-           if (status == SMS_STRING && memberstruct->type == M_ANY)
-             com_err(whoami, 0, "Unable to find member %s to delete from %s",
+         membervec[1] = "STRING";
+         status = mr_query("tag_member_of_list", 4, membervec,
+                           NULL, NULL);
+         if (status == MR_STRING && memberstruct->type == M_ANY)
+           {
+             com_err(whoami, 0, " Unable to find member %s on list %s",
+                     memberstruct->name, listname);
+             success = 0;
+           }
+         else if (status != MR_SUCCESS)
+           {
+             com_err(whoami, status, "while retagging member %s on %s",
+                     memberstruct->name, listname);
+             success = 0;
+           }
+         break;
+       case M_KERBEROS:
+         membervec[1] = "KERBEROS";
+         status = mr_query("tag_member_of_list", 4, membervec,
+                           NULL, NULL);
+         if (status == MR_STRING || status == MR_NO_MATCH)
+           {
+             /* Try canonicalizing the Kerberos principal and trying
+              * again.  If we succeed, print the message from mrcl.
+              * Otherwise, just pretend we never did this and print 
+              * the original error message.
+              */
+             mrcl_validate_kerberos_member(membervec[2], &membervec[2]);
+             if (mrcl_get_message())
+               {
+                 if (mr_query("tag_member_of_list", 4, membervec,
+                              NULL, NULL) == MR_SUCCESS)
+                   mrcl_com_err(whoami);
+                 status = MR_SUCCESS;
+               }
+           }
+         if (status != MR_SUCCESS)
+           {
+             com_err(whoami, status, "while changing tag on member %s of %s",
                      memberstruct->name, listname);
-           else if (status != SMS_SUCCESS)
-             com_err(whoami, status, " while deleteing member %s from %s",
+             success = 0;
+           }
+       case M_MACHINE:
+         membervec[1] = "MACHINE";
+         status = mr_query("tag_member_of_list", 4, membervec,
+                           NULL, NULL);
+         if (status != MR_SUCCESS)
+           {
+             com_err(whoami, status, "while adding member %s to %s",
                      memberstruct->name, listname);
+             success = 0;
+           }
        }
     }
 
-    /* Display the members of the list now, if requested */
-    if (memberflg) {
-       if (recursflg)
-         recursive_display_list_members();
-       else {
-           status = sms_query("get_members_of_list", 1, &listname,
-                              get_list_members, (char *)memberlist);
-           if (status)
-             com_err(whoami, status, " while getting members of list %s",
-                     listname);
-           while (sq_get_data(memberlist, &memberstruct))
-             show_list_member(memberstruct);
+  /* Display the members of the list now, if requested */
+  if (memberflg)
+    {
+      if (recursflg)
+       recursive_display_list_members();
+      else
+       {
+         status = mr_query(showtags ? "get_tagged_members_of_list" :
+                           "get_members_of_list", 1, &listname,
+                           get_list_members, memberlist);
+         if (status)
+           com_err(whoami, status, "while getting members of list %s",
+                   listname);
+         while (sq_get_data(memberlist, &memberstruct))
+           show_list_member(memberstruct);
        }
     }
 
-    /* We're done! */
-    sms_disconnect();
-    exit(0);
+  /* We're done! */
+  mr_disconnect();
+  exit(success ? 0 : 1);
 }
 
-usage(argv)
-char **argv;
+void usage(char **argv)
 {
-    fprintf(stderr, "Usage: %s [options] listname [options]\n",argv[0]);
-    fprintf(stderr, "Options are\n");
-    fprintf(stderr, "   -v | -verbose\n");
-    fprintf(stderr, "   -m | -members\n");
-    fprintf(stderr, "   -i | -info\n");
-    fprintf(stderr, "   -r | -recursive\n");
-    fprintf(stderr, "   -a | -add member\n");
-    fprintf(stderr, "   -d | -delete member\n");
-    fprintf(stderr, "   -f | -file filename\n");
-    fprintf(stderr, "   -D | -debug\n");
-    exit(1);
+#define USAGE_OPTIONS_FORMAT "  %-39s%s\n"
+  fprintf(stderr, "Usage: %s listname [options]\n", argv[0]);
+  fprintf(stderr, "Options are\n");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-v  | -verbose",
+         "-C   | -create");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-m  | -members",
+         "-R   | -rename newname");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-u  | -users",
+         "-P   | -public");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-l  | -lists",
+         "-NP  | -private");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-s  | -strings",
+         "-A   | -active");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-k  | -kerberos",
+         "-I   | -inactive");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-i  | -info",
+         "-V   | -visible");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-r  | -recursive",
+         "-H   | -hidden");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-a  | -add member",
+         "-M   | -mail");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-d  | -delete member",
+         "-NM  | -notmail");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-al | -addlist filename",
+         "-G   | -group");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-dl | -deletelist filename",
+         "-NG  | -notgroup");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-f  | -file filename",
+         "-N   | -nfs");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-at | -addtagged member tag",
+         "-NN  | -notnfs");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-ct | -changetag member tag",
+         "-mm  | -mailman");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-t  | -tags",
+         "-nmm | -notmailman");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-D  | -desc description",
+         "-ms  | -mailman_server server");
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-O  | -owner owner",
+         "-MA  | -memacl membership_acl"); 
+  fprintf(stderr, USAGE_OPTIONS_FORMAT, "-n  | -noauth",
+         "-db  | -database host[:port]");
+  exit(1);
 }
 
 
 /* Display the members stored in the queue */
 
-show_list_member(memberstruct)
-struct member *memberstruct;
+void show_list_member(struct member *memberstruct)
 {
-    if (verbose) {
-       char *s;
-       switch (memberstruct->type) {
-       case M_USER:
-           s = "USER";
-           break;
-       case M_LIST:
-           s = "LIST";
-           break;
-       case M_STRING:
-           s = "STRING";
-           break;
-       case M_ANY:
-           printf("%s\n", memberstruct->name);
-           return;
-       }
-       printf("%s:%s\n", s, memberstruct->name);
-    } else {
-       if (memberstruct->type == M_LIST)
-         printf("LIST:%s\n", memberstruct->name);
-       else if (memberstruct->type == M_STRING &&
-                !index(memberstruct->name, '@'))
-         printf("STRING:%s\n", memberstruct->name);
-       else
-         printf("%s\n", memberstruct->name);
+  char *s = "";
+
+  switch (memberstruct->type)
+    {
+    case M_USER:
+      if (!showusers)
+       return;
+      s = "USER";
+      break;
+    case M_LIST:
+      if (!showlists)
+       return;
+      s = "LIST";
+      break;
+    case M_STRING:
+      if (!showstrings)
+       return;
+      s = "STRING";
+      break;
+    case M_KERBEROS:
+      if (!showkerberos)
+       return;
+      s = "KERBEROS";
+      break;
+    case M_MACHINE:
+      if (!showmachines)
+       return;
+      s = "MACHINE";
+      break;
+    case M_ANY:
+      printf("%s\n", memberstruct->name);
+      return;
     }
+
+  if (verbose)
+    printf("%s:%s", s, memberstruct->name);
+  else
+    {
+      if (memberstruct->type == M_LIST)
+       printf("LIST:%s", memberstruct->name);
+      else if (memberstruct->type == M_KERBEROS)
+       printf("KERBEROS:%s", memberstruct->name);
+      else if (memberstruct->type == M_STRING &&
+              !strchr(memberstruct->name, '@'))
+       printf("STRING:%s", memberstruct->name);
+      else if (memberstruct->type == M_MACHINE)
+       printf("MACHINE:%s", memberstruct->name);
+      else
+       printf("%s", memberstruct->name);
+    }
+  if (showtags && *(memberstruct->tag))
+    printf(" (%s)\n", memberstruct->tag);
+  else
+    printf("\n");
 }
 
 
 /* Show the retrieved information about a list */
 
-show_list_info(argc, argv, hint)
-int argc;
-char **argv;
-int hint;
+int show_list_info(int argc, char **argv, void *hint)
 {
-    printf("List: %s\n", argv[0]);
-    printf("Description: %s\n", argv[9]);
-    printf("Flags: %s, %s, and %s\n",
-          atoi(argv[1]) ? "active" : "inactive",
-          atoi(argv[2]) ? "public" : "private",
-          atoi(argv[3]) ? "hidden" : "visible");
-    printf("%s is %sa maillist and is %sa group", argv[0],
-          atoi(argv[4]) ? "" : "not ",
-          atoi(argv[5]) ? "" : "not ");
-    if (atoi(argv[5]))
-      printf(" with GID %d\n", atoi(argv[6]));
-    else
-      printf("\n");
-    printf("Owner: %s %s\n", argv[7], argv[8]);
-    printf("Last modified by %s with %s on %s\n", argv[11], argv[12], argv[10]);
-    return(SMS_CONT);
+  printf("List: %s\n", argv[L_NAME]);
+  printf("Description: %s\n", argv[L_DESC]);
+  printf("Flags: %s, %s, and %s\n",
+        atoi(argv[L_ACTIVE]) ? "active" : "inactive",
+        atoi(argv[L_PUBLIC]) ? "public" : "private",
+        atoi(argv[L_HIDDEN]) ? "hidden" : "visible");
+  printf("%s is %sa maillist and is %sa group", argv[L_NAME],
+        atoi(argv[L_MAILLIST]) ? "" : "not ",
+        atoi(argv[L_GROUP]) ? "" : "not ");
+  if (atoi(argv[L_GROUP]))
+    {
+      if (atoi(argv[L_NFSGROUP]))
+       printf(" (and an NFS group)");
+      printf(" with GID %d\n", atoi(argv[L_GID]));
+    }
+  else
+    printf("\n");
+  if (atoi(argv[L_MAILMAN]))
+    printf("%s is a Mailman list on server %s\n", argv[L_NAME],
+          argv[L_MAILMAN_SERVER]);
+  printf("Owner: %s %s\n", argv[L_ACE_TYPE], argv[L_ACE_NAME]);
+  if (strcmp(argv[L_MEMACE_TYPE], "NONE"))
+    printf("Membership ACL: %s %s\n", argv[L_MEMACE_TYPE], 
+          argv[L_MEMACE_NAME]);
+  printf("Last modified by %s with %s on %s\n", 
+        argv[L_MODBY], argv[L_MODWITH], argv[L_MODTIME]);
+  return MR_CONT;
 }
 
 
+/* Copy retrieved information about a list into a new argv */
+
+int save_list_info(int argc, char **argv, void *hint)
+{
+  char **nargv = hint;
+
+  for (argc = 0; argc < 16; argc++)
+    nargv[argc + 1] = strdup(argv[argc]);
+  return MR_CONT;
+}
+
 /* Show the retrieve list member count */
 
-show_list_count(argc, argv, hint)
-int argc;
-char **argv;
-int hint;
+int show_list_count(int argc, char **argv, void *hint)
 {
-    printf("Members: %s\n", argv[0]);
+  printf("Members: %s\n", argv[0]);
+  return MR_CONT;
 }
 
 
 /* Recursively find all of the members of listname, and then display them */
 
-recursive_display_list_members()
+void recursive_display_list_members(void)
 {
-    int status, count, savecount;
-    struct save_queue *lists, *members;
-    struct member *m, *m1, *data;
-
-    lists = sq_create();
-    members = sq_create();
-    m = (struct member *) malloc(sizeof(struct member));
-    m->type = M_LIST;
-    m->name = listname;
-    sq_save_data(lists, m);
-
-    while (sq_get_data(lists, &m)) {
-       sq_destroy(memberlist);
-       memberlist = sq_create();
-       if (debugflg)
-         fprintf(stderr, "Fetching members of %s\n", m->name);
-       status = sms_query("get_members_of_list", 1, &(m->name),
-                          get_list_members, (char *)memberlist);
-       if (status)
-         com_err(whoami, status, " while getting members of list %s", m->name);
-       while (sq_get_data(memberlist, &m1)) {
-           if (m1->type == M_LIST)
-             unique_add_member(lists, m1);
-           else
-             unique_add_member(members, m1);
+  int status, count, savecount;
+  struct save_queue *lists, *members;
+  struct member *m, *m1, *data;
+
+  lists = sq_create();
+  members = sq_create();
+  m = malloc(sizeof(struct member));
+  m->type = M_LIST;
+  m->name = listname;
+  sq_save_data(lists, m);
+
+  while (sq_get_data(lists, &m))
+    {
+      sq_destroy(memberlist);
+      memberlist = sq_create();
+      status = mr_query("get_members_of_list", 1, &(m->name),
+                       get_list_members, memberlist);
+      if (status)
+       com_err(whoami, status, "while getting members of list %s", m->name);
+      while (sq_get_data(memberlist, &m1))
+       {
+         if (m1->type == M_LIST)
+           unique_add_member(lists, m1);
+         else
+           unique_add_member(members, m1);
        }
     }
-    savecount = count = sq_count_elts(members);
-    data = (struct member *) malloc(count * sizeof(struct member));
-    count = 0;
-    while (sq_get_data(members, &m))
-      bcopy(m, &data[count++], sizeof(struct member));
-    qsort(data, count, sizeof(struct member), membercmp);
-    for (count = 0; count < savecount; count++) {
-       show_list_member(&data[count]);
-    }
+  savecount = count = sq_count_elts(members);
+  data = malloc(count * sizeof(struct member));
+  count = 0;
+  while (sq_get_data(members, &m))
+    memcpy(&data[count++], m, sizeof(struct member));
+  qsort(data, count, sizeof(struct member), membercmp);
+  for (count = 0; count < savecount; count++)
+    show_list_member(&data[count]);
 }
 
 
 /* add a struct member to a queue if that member isn't already there. */
 
-unique_add_member(q, m)
-struct save_queue  *q;
-struct member *m;
+void unique_add_member(struct save_queue *q, struct member *m)
 {
-    struct save_queue *qp;
+  struct save_queue *qp;
 
-    for (qp = q->q_next; qp != q; qp = qp->q_next) {
-       if (!membercmp(qp->q_data, m))
-         return;
+  for (qp = q->q_next; qp != q; qp = qp->q_next)
+    {
+      if (!membercmp(qp->q_data, m))
+       return;
     }
-    sq_save_data(q, m);
+  sq_save_data(q, m);
 }
 
 
 /* Collect the retrieved members of the list */
 
-get_list_members(argc, argv, q)
-int argc;
-char **argv;
-struct save_queue *q;
+int get_list_members(int argc, char **argv, void *sq)
 {
-    struct member *m;
+  struct save_queue *q = sq;
+  struct member *m;
 
-    m = (struct member *) malloc(sizeof(struct member));
-    switch (argv[0][0]) {
+  m = malloc(sizeof(struct member));
+  switch (argv[0][0])
+    {
     case 'U':
-       m->type = M_USER;
-       break;
+      m->type = M_USER;
+      break;
     case 'L':
-       m->type = M_LIST;
-       break;
+      m->type = M_LIST;
+      break;
     case 'S':
-       m->type = M_STRING;
-       break;
+      m->type = M_STRING;
+      break;
+    case 'K':
+      m->type = M_KERBEROS;
+      break;
+    case 'M':
+      m->type = M_MACHINE;
+      break;
     }
-    m->name = strsave(argv[1]);
-    sq_save_data(q, m);
-    return(SMS_CONT);
+  m->name = strdup(argv[1]);
+  if (argc == 3)
+    m->tag = strdup(argv[2]);
+  else
+    m->tag = strdup("");
+  sq_save_data(q, m);
+  return MR_CONT;
 }
 
 
-/* Called only if a query returns a value that we weren't expecting */
+/* Open file, parse members from file, and put them on the specified queue */
+void get_members_from_file(char *filename, struct save_queue *queue)
+{
+  FILE *in;
+  char buf[BUFSIZ];
+  struct member *memberstruct;
+
+  if (!strcmp(filename, "-"))
+    in = stdin;
+  else
+    {
+      in = fopen(filename, "r");
+      if (!in)
+       {
+         com_err(whoami, errno, "while opening %s for input", filename);
+         exit(2);
+       }
+    }
+
+  while (fgets(buf, BUFSIZ, in))
+    {
+      if ((memberstruct = parse_member(buf)))
+       sq_save_data(queue, memberstruct);
+    }
+  if (!feof(in))
+    {
+      com_err(whoami, errno, "while reading from %s", filename);
+      exit(2);
+    }
+}
+
 
-scream()
+/* Collect the possible expansions of the alias MAILHUB */
+
+int collect(int argc, char **argv, void *l)
 {
-    fprintf(stderr, "Programmer botch\n");
-    exit(3);
+  char ***list = l;
+  int i;
+
+  for (i = 0; (*list)[i]; i++)
+    ;
+  *list = realloc(*list, (i + 2) * sizeof(char *));
+  (*list)[i] = strdup(argv[2]);
+  (*list)[i + 1] = NULL;
+  return MR_CONT;
 }
 
 
 /* Parse a line of input, fetching a member.  NULL is returned if a member
- * is not found.  Only the first token on the line is parsed.  ';' is a
- * comment character.
+ * is not found.  ';' is a comment character.
  */
 
-struct member *parse_member(s)
-register char *s;
+struct member *parse_member(char *s)
 {
-    register struct member *m;
-    char *p;
-
-    while (*s && isspace(*s))
-      s++;
-    p = s;
-    while (*p && isprint(*p) && !isspace(*p) && *p != ';')
-      p++;
-    *p = 0;
-    if (p == s || strlen(s) == 0)
-      return(NULL);
-
-    if ((m = (struct member *) malloc(sizeof(struct member))) == NULL)
-      return(NULL);
-
-    if (p = index(s, ':')) {
-       *p = 0;
-       m->name = ++p;
-       if (!strcasecmp("user", s))
-         m->type = M_USER;
-       else if (!strcasecmp("list", s))
-         m->type = M_LIST;
-       else if (!strcasecmp("string", s))
-         m->type = M_STRING;
-       else {
-           m->type = M_STRING;
-           *(--p) = ':';
-           m->name = s;
+  struct member *m;
+  char *p, *lastchar;
+
+  while (*s && isspace(*s))
+    s++;
+  lastchar = p = s;
+  while (*p && *p != '\n' && *p != ';')
+    {
+      if (isprint(*p) && !isspace(*p))
+       lastchar = p++;
+      else
+       p++;
+    }
+  lastchar++;
+  *lastchar = '\0';
+  if (p == s || strlen(s) == 0)
+    return NULL;
+
+  if (!(m = malloc(sizeof(struct member))))
+    return NULL;
+  m->tag = strdup("");
+
+  if ((p = strchr(s, ':')))
+    {
+      *p = '\0';
+      m->name = ++p;
+      if (!strcasecmp("user", s))
+       m->type = M_USER;
+      else if (!strcasecmp("list", s))
+       m->type = M_LIST;
+      else if (!strcasecmp("string", s))
+       m->type = M_STRING;
+      else if (!strcasecmp("kerberos", s))
+       m->type = M_KERBEROS;
+      else if (!strcasecmp("machine", s))
+       m->type = M_MACHINE;
+      else if (!strcasecmp("none", s))
+       m->type = M_NONE;
+      else
+       {
+         m->type = M_ANY;
+         *(--p) = ':';
+         m->name = s;
        }
-       m->name = strsave(m->name);
-       return(m);
+      m->name = strdup(m->name);
     }
-    m->name = strsave(s);
-    if (index(s, '@') || index(s, '!') || index(s, '%'))
-      m->type = M_STRING;
-    else
-      m->type = M_ANY;
-    return(m);
+  else
+    {
+      m->name = strdup(s);
+      m->type = strcasecmp(s, "none") ? M_ANY : M_NONE;
+    }
+  return m;
 }
 
 
-  /* 
  * This routine two compares members by the following rules:
  * 1.  A USER is less than a LIST
  * 2.  A LIST is less than a STRING
  * 3.  If two members are of the same type, the one alphabetically first
  *     is less than the other
  * It returs < 0 if the first member is less, 0 if they are identical, and
  * > 0 if the second member is less (the first member is greater).
  */
+/*
+ * This routine two compares members by the following rules:
+ * 1.  A USER is less than a LIST
+ * 2.  A LIST is less than a STRING
+ * 3.  If two members are of the same type, the one alphabetically first
+ *     is less than the other
+ * It returs < 0 if the first member is less, 0 if they are identical, and
+ * > 0 if the second member is less (the first member is greater).
+ */
 
-int membercmp(m1, m2)
-  struct member *m1, *m2;
+int membercmp(const void *mem1, const void *mem2)
 {
-    if (m1->type == M_ANY || m2->type  == M_ANY || (m1->type == m2->type))
-       return(strcmp(m1->name, m2->name));
-    else
-       return(m1->type - m2->type);
+  const struct member *m1 = mem1, *m2 = mem2;
+
+  if (m1->type == M_ANY || m2->type == M_ANY || (m1->type == m2->type))
+    return strcmp(m1->name, m2->name);
+  else
+    return m1->type - m2->type;
 }
 
 
-sq_count_elts(q)
-struct save_queue *q;
+int sq_count_elts(struct save_queue *q)
 {
-    char  *foo;
-    int count;
+  char *foo;
+  int count;
 
-    count = 0;
-    while (sq_get_data(q, &foo))
-      count++;
-    return(count);
+  count = 0;
+  while (sq_get_data(q, &foo))
+    count++;
+  return count;
+}
+
+char *get_username(void)
+{
+  char *username;
+
+  username = getenv("USER");
+  if (!username)
+    {
+      username = mrcl_krb_user();
+      if (!username)
+       {
+         com_err(whoami, 0, "Could not determine username");
+         exit(1);
+       }
+    }
+  return username;
 }
This page took 0.102174 seconds and 4 git commands to generate.