#include <mit-copyright.h>
#include <errno.h>
#include <stdio.h>
+#include <stdlib.h>
#include <ctype.h>
#include <string.h>
#include <moira.h>
char *listname, *whoami;
#ifndef POSIX
-extern char *index();
extern int errno;
#endif
int argc;
char **argv;
{
- int status;
+ int status, success;
char **arg = argv;
char *membervec[3], *motd;
struct member *memberstruct;
synclist = sq_create();
whoami = argv[0];
+ success = 1;
+
/* parse args, building addlist, dellist, & synclist */
while (++arg - argv < argc) {
if (**arg == '-')
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;
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;
+ }
}
}
memberstruct->type != M_ANY) {
com_err(whoami, status, "while deleting member %s from %s",
memberstruct->name, listname);
+ success = 0;
break;
}
case M_LIST:
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;
+ }
}
}
/* We're done! */
mr_disconnect();
- exit(0);
+ exit(success?0:1);
}
usage(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);
}
while (fgets(buf, BUFSIZ, in))
if (memberstruct = parse_member(buf))
sq_save_data(queue, memberstruct);
- if (!feof(in))
+ if (!feof(in)) {
com_err(whoami, errno, "while reading from %s", filename);
+ exit(2);
+ }
}