X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/ece49f32561b6c77d8c8ac865c82d3bcf2eee2a3..e681e918d9651f673c209d5cbca880d128ad69fc:/clients/blanche/blanche.c diff --git a/clients/blanche/blanche.c b/clients/blanche/blanche.c index f13a18fc..e867faf0 100644 --- a/clients/blanche/blanche.c +++ b/clients/blanche/blanche.c @@ -15,8 +15,11 @@ Do we need to improve the support for queue operations? */ #include +#include #include +#include #include +#include #include #include @@ -49,11 +52,12 @@ struct save_queue *addlist, *dellist, *memberlist, *synclist; char *listname, *whoami; -extern char *index(); +#ifndef POSIX 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(); @@ -62,11 +66,11 @@ main(argc, argv) int argc; char **argv; { - int status; + int status, success; 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; @@ -78,6 +82,8 @@ char **argv; synclist = sq_create(); whoami = argv[0]; + success = 1; + /* parse args, building addlist, dellist, & synclist */ while (++arg - argv < argc) { if (**arg == '-') @@ -102,7 +108,7 @@ char **argv; verbose++; else if (argis("r","recursive")) recursflg++; - else if (argis("S","server")) + else if (argis("S","server") || argis("db","database")) if (arg - argv < argc - 1) { ++arg; server = *arg; @@ -115,6 +121,12 @@ char **argv; sq_save_data(addlist, memberstruct); } 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; @@ -122,28 +134,17 @@ char **argv; 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) { - 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); + get_members_from_file(*arg, synclist); } else usage(argv); else @@ -216,8 +217,10 @@ char **argv; if (syncflg) { status = mr_query("get_members_of_list", 1, &listname, get_list_members, (char *)memberlist); - if (status) - com_err(whoami, status, "getting members of list %s", listname); + 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; @@ -241,6 +244,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) { @@ -257,34 +295,57 @@ char **argv; 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; } case M_LIST: membervec[1] = "LIST"; status = mr_query("add_member_to_list", 3, membervec, scream, NULL); - if (status == MR_SUCCESS) - break; - else if (status != MR_LIST || memberstruct->type != M_ANY) { + if (status == MR_SUCCESS) { + if (!strcmp(membervec[0], getenv("USER"))) { + 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; } case M_STRING: membervec[1] = "STRING"; status = mr_query("add_member_to_list", 3, membervec, scream, NULL); - if (status != MR_SUCCESS) + if (status != MR_SUCCESS) { com_err(whoami, status, "while adding member %s to %s", memberstruct->name, listname); + success = 0; + } + else if (!strchr(memberstruct->name, '@') && + !strchr(memberstruct->name, '!') && + !strchr(memberstruct->name, '%')) { + fprintf(stderr, "\nWARNING: \"STRING:%s\" was just added to list \"%s\".\n", + memberstruct->name, listname); + fprintf(stderr, "\tIf %s is a mailing list, this may cause it to stop working.\n", listname); + fprintf(stderr, "\tYou should consider removing \"STRING:%s\" from the list.\n", memberstruct->name); + } break; case M_KERBEROS: membervec[1] = "KERBEROS"; status = mr_query("add_member_to_list", 3, membervec, scream, NULL); - if (status != MR_SUCCESS) + if (status != MR_SUCCESS) { com_err(whoami, status, "while adding member %s to %s", memberstruct->name, listname); + success = 0; + } } } @@ -308,6 +369,7 @@ char **argv; memberstruct->type != M_ANY) { com_err(whoami, status, "while deleting member %s from %s", memberstruct->name, listname); + success = 0; break; } case M_LIST: @@ -318,28 +380,53 @@ char **argv; break; else if ((status != MR_LIST && status != MR_NO_MATCH) || memberstruct->type != M_ANY) { + if (status == MR_PERM && memberstruct->type == M_ANY) { + /* M_ANY means we've fallen through from the user case + * The fact that we didn't get MR_PERM there indicates + * that we had permission to remove the specified member + * from the list if it is a user, but not a list. This is + * if we are the member in question. Since we exist as a user + * we must have gotten the MR_NO_MATCH error, so we will + * return that, since it will be less confusing. However, + * This will generate the wrongerror if the user was trying + * to remove the list with his/her username from a list they + * don'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, scream, NULL); - if (status == MR_STRING && memberstruct->type == M_ANY) + if (status == MR_STRING && memberstruct->type == M_ANY) { com_err(whoami, 0, " Unable to find member %s to delete from %s", memberstruct->name, listname); - else if (status != MR_SUCCESS) + success = 0; + if (!strcmp(membervec[0], getenv("USER"))) { + 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, scream, NULL); - if (status != MR_SUCCESS) + if (status != MR_SUCCESS) { com_err(whoami, status, "while deleting member %s from %s", memberstruct->name, listname); + success = 0; + } } } @@ -360,13 +447,13 @@ char **argv; /* We're done! */ mr_disconnect(); - exit(0); + exit(success?0:1); } 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"); @@ -378,9 +465,11 @@ char **argv; fprintf(stderr, " -r | -recursive\n"); fprintf(stderr, " -a | -add member\n"); fprintf(stderr, " -d | -delete member\n"); + fprintf(stderr, " -al | -addlist filename\n"); + fprintf(stderr, " -dl | -deletelist filename\n"); fprintf(stderr, " -f | -file filename\n"); fprintf(stderr, " -n | -noauth\n"); - fprintf(stderr, " -S | -server host:port\n"); + fprintf(stderr, " -db | -database host[:port]\n"); fprintf(stderr, " -D | -debug\n"); exit(1); } @@ -391,7 +480,7 @@ char **argv; show_list_member(memberstruct) struct member *memberstruct; { - char *s; + char *s = ""; switch (memberstruct->type) { case M_USER: @@ -427,7 +516,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); @@ -507,7 +596,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]); @@ -570,30 +659,79 @@ scream() } +/* Open file, parse members from file, and put them on the specified queue */ +get_members_from_file(filename, queue) +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); + } +} + + +/* 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. 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; { register struct member *m; - char *p; + char *p, *lastchar; while (*s && isspace(*s)) s++; - p = s; - while (*p && isprint(*p) && !isspace(*p) && *p != ';') - p++; - *p = 0; + 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 = (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)) @@ -610,13 +748,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, '%')) - m->type = M_STRING; - else - m->type = M_ANY; return(m); }