*** empty log message ***

[moira.git] / clients / blanche / blanche.c

diff --git a/clients/blanche/blanche.c b/clients/blanche/blanche.c
index 6d582928b6dd500e48927a92449d5ea83bd97cc3..2358cc9ee3e648dd9fd72272111a245105499c2d 100644 (file)
--- a/clients/blanche/blanche.c
+++ b/clients/blanche/blanche.c
@@ -17,6 +17,7 @@
 #include <mit-copyright.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include <moira.h>
 #include <moira_site.h>
 
@@ -49,11 +50,13 @@ struct save_queue *addlist, *dellist, *memberlist, *synclist;
 
 char *listname, *whoami;
 
+#ifndef POSIX
 extern char *index();
 extern int errno;
+#endif
 
 int show_list_info(), show_list_count(), get_list_members(), scream();
-int show_list_members();
+int show_list_members(), membercmp();
 struct member *parse_member();
 
 
@@ -66,7 +69,7 @@ char **argv;
     char **arg = argv;
     char *membervec[3], *motd;
     struct member *memberstruct;
-    char *server = NULL;
+    char *server = NULL, *p;
 
     /* clear all flags & lists */
     infoflg = verbose = syncflg = memberflg = debugflg = recursflg = 0;
@@ -236,6 +239,41 @@ char **argv;
 
     /* Process the add list */
     while (sq_get_data(addlist, &memberstruct)) {
+       /* canonicalize string if necessary */
+       if (memberstruct->type == M_STRING &&
+           (p = strchr(memberstruct->name, '@'))) {
+           char *host = canonicalize_hostname(strsave(++p));
+           static char **mailhubs = NULL;
+           char *argv[4];
+           int i, collect();
+
+           if (!mailhubs) {
+               argv[0] = "mailhub";
+               argv[1] = "TYPE";
+               argv[2] = "*";
+               mailhubs = (char **)malloc(sizeof(char *));
+               mailhubs[0] = NULL;
+               status = mr_query("get_alias", 3, argv, collect,
+                                  (char *)&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 = strsave(memberstruct->name);
+                   *(strchr(memberstruct->name, '@')) = 0;
+                   memberstruct->type = M_ANY;
+                   fprintf(stderr, "Warning: \"STRING:%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;
        if (verbose) {
@@ -361,7 +399,7 @@ char **argv;
 usage(argv)
 char **argv;
 {
-    fprintf(stderr, "Usage: %s [options] listname [options]\n",argv[0]);
+    fprintf(stderr, "Usage: %s listname [options]\n",argv[0]);
     fprintf(stderr, "Options are\n");
     fprintf(stderr, "   -v | -verbose\n");
     fprintf(stderr, "   -m | -members\n");
@@ -388,7 +426,7 @@ char **argv;
 show_list_member(memberstruct)
 struct member *memberstruct;
 {
-    char *s;
+    char *s = "";
 
     switch (memberstruct->type) {
     case M_USER:
@@ -424,7 +462,7 @@ struct member *memberstruct;
        else if (memberstruct->type == M_KERBEROS)
          printf("KERBEROS:%s\n", memberstruct->name);
        else if (memberstruct->type == M_STRING &&
-                !index(memberstruct->name, '@'))
+                !strchr(memberstruct->name, '@'))
          printf("STRING:%s\n", memberstruct->name);
        else
          printf("%s\n", memberstruct->name);
@@ -504,7 +542,7 @@ recursive_display_list_members()
     data = (struct member *) malloc(count * sizeof(struct member));
     count = 0;
     while (sq_get_data(members, &m))
-      bcopy(m, &data[count++], sizeof(struct member));
+      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]);
@@ -594,6 +632,23 @@ struct save_queue *queue;
 }
 
 
+/* Collect the possible expansions of the alias MAILHUB */
+
+int collect(argc, argv, list)
+int argc;
+char **argv;
+char ***list;
+{
+    int i;
+
+    for (i = 0; (*list)[i]; i++);
+    *list = (char **)realloc(*list, (i + 2) * sizeof(char *));
+    (*list)[i] = strsave(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.  ';' is a comment character.
  */
@@ -620,7 +675,7 @@ register char *s;
     if ((m = (struct member *) malloc(sizeof(struct member))) == NULL)
       return(NULL);
 
-    if (p = index(s, ':')) {
+    if (p = strchr(s, ':')) {
        *p = 0;
        m->name = ++p;
        if (!strcasecmp("user", s))
@@ -637,13 +692,13 @@ register char *s;
            m->name = s;
        }
        m->name = strsave(m->name);
-       return(m);
+    } else {
+       m->name = strsave(s);
+       if (strchr(s, '@') || strchr(s, '!') || strchr(s, '%') || strchr(s, ' '))
+         m->type = M_STRING;
+       else
+         m->type = M_ANY;
     }
-    m->name = strsave(s);
-    if (index(s, '@') || index(s, '!') || index(s, '%') || index(s, ' '))
-      m->type = M_STRING;
-    else
-      m->type = M_ANY;
     return(m);
 }