X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/d465790ce70f9f4b3de69b38cc5afebee4e3d8e1..31b88f9ec3865936f428c33ae2ba554bc8f4f1ad:/clients/blanche/blanche.c diff --git a/clients/blanche/blanche.c b/clients/blanche/blanche.c index edfb3d8d..8174e86c 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,8 +52,9 @@ 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(), membercmp(); @@ -102,7 +106,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; @@ -211,8 +215,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; @@ -238,7 +244,7 @@ char **argv; while (sq_get_data(addlist, &memberstruct)) { /* canonicalize string if necessary */ if (memberstruct->type == M_STRING && - (p = index(memberstruct->name, '@'))) { + (p = strchr(memberstruct->name, '@'))) { char *host = canonicalize_hostname(strsave(++p)); static char **mailhubs = NULL; char *argv[4]; @@ -250,7 +256,8 @@ char **argv; argv[2] = "*"; mailhubs = (char **)malloc(sizeof(char *)); mailhubs[0] = NULL; - status = mr_query("get_alias", 3, argv, collect, &mailhubs); + 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"); @@ -260,7 +267,7 @@ char **argv; for (i = 0; p = mailhubs[i]; i++) { if (!strcasecmp(p, host)) { host = strsave(memberstruct->name); - *(index(memberstruct->name, '@')) = 0; + *(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); @@ -292,9 +299,18 @@ char **argv; 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); break; @@ -306,6 +322,14 @@ char **argv; if (status != MR_SUCCESS) com_err(whoami, status, "while adding member %s to %s", memberstruct->name, listname); + 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"; @@ -347,6 +371,20 @@ 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); break; @@ -355,10 +393,15 @@ char **argv; 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) + 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); break; @@ -411,7 +454,7 @@ char **argv; 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); } @@ -458,7 +501,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); @@ -538,7 +581,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]); @@ -671,7 +714,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)) @@ -690,7 +733,7 @@ register char *s; m->name = strsave(m->name); } else { m->name = strsave(s); - if (index(s, '@') || index(s, '!') || index(s, '%') || index(s, ' ')) + if (strchr(s, '@') || strchr(s, '!') || strchr(s, '%') || strchr(s, ' ')) m->type = M_STRING; else m->type = M_ANY;