Do we need to improve the support for queue operations? */
#include <mit-copyright.h>
+#include <errno.h>
#include <stdio.h>
+#include <stdlib.h>
#include <ctype.h>
+#include <string.h>
#include <moira.h>
#include <moira_site.h>
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();
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;
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;
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;
/* 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) {
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;
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";
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;
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;
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");
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);
}
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);
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]);
}
+/* 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.
*/
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))
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);
}
andersk / moira.git / blobdiff