*/
#include <stdio.h>
-#include <strings.h>
+#include <string.h>
#include <moira.h>
#include <moira_site.h>
#include <menu.h>
if (name) {
while (1) {
newname = Strsave(info[L_NAME]);
- GetValueFromUser("The new name for this list", &newname);
+ if (GetValueFromUser("The new name for this list", &newname) ==
+ SUB_ERROR)
+ return(NULL);
if (ValidName(newname))
break;
}
}
- GetYesNoValueFromUser("Is this an active list", &info[L_ACTIVE]);
- GetYesNoValueFromUser("Is this a public list", &info[L_PUBLIC]);
- GetYesNoValueFromUser("Is this a hidden list", &info[L_HIDDEN]);
- GetYesNoValueFromUser("Is this a maillist", &info[L_MAILLIST]);
- GetYesNoValueFromUser("Is this a group", &info[L_GROUP]);
+ if (GetYesNoValueFromUser("Is this an active list", &info[L_ACTIVE]) ==
+ SUB_ERROR)
+ return(NULL);
+ if (GetYesNoValueFromUser("Is this a public list", &info[L_PUBLIC]) ==
+ SUB_ERROR)
+ return(NULL);
+ if (GetYesNoValueFromUser("Is this a hidden list", &info[L_HIDDEN]) ==
+ SUB_ERROR)
+ return(NULL);
+ if (GetYesNoValueFromUser("Is this a maillist", &info[L_MAILLIST]) ==
+ SUB_ERROR)
+ return(NULL);
+ if (GetYesNoValueFromUser("Is this a group", &info[L_GROUP]) == SUB_ERROR)
+ return(NULL);
if (atoi(info[L_GROUP]))
- GetValueFromUser("What is the GID for this group.", &info[L_GID]);
+ if (GetValueFromUser("What is the GID for this group.", &info[L_GID]) ==
+ SUB_ERROR)
+ return(NULL);
- GetTypeFromUser("What Type of Administrator", "ace_type",&info[L_ACE_TYPE]);
+ if (GetTypeFromUser("What Type of Administrator", "ace_type",
+ &info[L_ACE_TYPE]) == SUB_ERROR)
+ return(NULL);
if ((strcasecmp(info[L_ACE_TYPE], "NONE") != 0) &&
(strcasecmp(info[L_ACE_TYPE], "none") != 0)) {
sprintf(temp_buf, "Which %s will be the administrator of this list: ",
info[L_ACE_TYPE]);
- GetValueFromUser(temp_buf, &info[L_ACE_NAME]);
+ if (GetValueFromUser(temp_buf, &info[L_ACE_NAME]) == SUB_ERROR)
+ return(NULL);
}
- GetValueFromUser("Description: ", &info[L_DESC]);
+ if (GetValueFromUser("Description: ", &info[L_DESC]) == SUB_ERROR)
+ return(NULL);
FreeAndClear(&info[L_MODTIME], TRUE);
FreeAndClear(&info[L_MODBY], TRUE);
register int stat;
char ** args;
- args = AskListInfo(info, TRUE);
+ if ((args = AskListInfo(info, TRUE)) == NULL) {
+ Put_message("Aborted.");
+ return;
+ }
if ( (stat = do_mr_query("update_list", CountArgs(args), args,
Scream, (char *) NULL)) != MR_SUCCESS) {
com_err(program_name, stat, " in UpdateList.");
{
static char *info[MAX_ARGS_SIZE], **add_args;
int status, ret_code = SUB_NORMAL;
+ struct qelem *elem = NULL;
if (!ValidName(argv[1]))
return(DM_NORMAL);
return(SUB_ERROR);
}
- add_args = AskListInfo(SetDefaults(info,argv[1]), FALSE);
+ /*
+ * If the listname is less than 8 characters, make sure it doesn't
+ * collide with a username.
+ */
+ if ((strlen(argv[1]) <= 8) &&
+ do_mr_query("get_user_account_by_login", 1, argv + 1,
+ StoreInfo, (char *) &elem) == 0) {
+ Put_message("A user by that name already exists in the database.");
+ Loop(QueueTop(elem), FreeInfo);
+ FreeQueue(elem);
+ if (YesNoQuestion("Crate a list with the same name",
+ FALSE) != TRUE)
+ return(SUB_ERROR);
+ }
+
+ if ((add_args = AskListInfo(SetDefaults(info,argv[1]), FALSE)) == NULL) {
+ Put_message("Aborted.");
+ return(SUB_ERROR);
+ }
if ( (status = do_mr_query("add_list", CountArgs(add_args), add_args,
Scream, (char *) NULL)) != MR_SUCCESS) {
GetMemberInfo(action, ret_argv)
char *action, **ret_argv;
{
- char temp_buf[BUFSIZ], ret_buf[BUFSIZ];
+ char temp_buf[BUFSIZ];
ret_argv[LM_LIST] = Strsave(current_list);
ret_argv[LM_TYPE] = Strsave("user");
- GetTypeFromUser("Type of member", "member", &ret_argv[LM_TYPE]);
+ if (GetTypeFromUser("Type of member", "member", &ret_argv[LM_TYPE]) ==
+ SUB_ERROR)
+ return(SUB_ERROR);
sprintf(temp_buf,"Name of %s to %s", ret_argv[LM_TYPE], action);
ret_argv[LM_MEMBER] = Strsave(user);
- GetValueFromUser(temp_buf, &ret_argv[LM_MEMBER]);
+ if (GetValueFromUser(temp_buf, &ret_argv[LM_MEMBER]) == SUB_ERROR)
+ return(SUB_ERROR);
ret_argv[LM_END] = NULL; /* NULL terminate this list. */
if (strcasecmp(ret_argv[LM_TYPE], "string") &&
int
AddMember()
{
- char *args[10], temp_buf[BUFSIZ];
+ char *args[10], temp_buf[BUFSIZ], *p;
register int status;
+ struct qelem *mailhubs, *elem, *GetTypeValues();
if ( GetMemberInfo("add", args) == SUB_ERROR )
return(DM_NORMAL);
+ if (!strcmp(args[LM_TYPE], "STRING")) {
+ if (p = strchr(args[LM_MEMBER], '@')) {
+ char *host = canonicalize_hostname(strsave(++p));
+ mailhubs = GetTypeValues("mailhub");
+ for (elem = mailhubs; elem; elem = elem->q_forw) {
+ if (!strcasecmp(host, elem->q_data)) {
+ free(host);
+ host = strsave(args[LM_MEMBER]);
+ *(--p) = 0;
+ sprintf(temp_buf, "String \"%s\" should be USER or LIST \"%s\" because it is a local name.",
+ host, args[LM_MEMBER]);
+ Put_message(temp_buf);
+ free(args[LM_TYPE]);
+ free(host);
+ return(DM_NORMAL);
+ }
+ }
+ free(host);
+ } else if (!strchr(args[LM_MEMBER], '!')) {
+ Put_message("Member which is not a foreign mail address should not be type STRING.");
+ return(DM_NORMAL);
+ }
+ }
+
if ( (status = do_mr_query("add_member_to_list", CountArgs(args), args,
Scream, NULL)) != MR_SUCCESS) {
if (status == MR_EXISTS) {
InterRemoveItemFromLists()
{
register int status;
- char type[BUFSIZ], name[BUFSIZ], *args[10], buf[BUFSIZ];
+ char *type, *name, *args[10], buf[BUFSIZ];
struct qelem *top, *elem;
- if ( !(PromptWithDefault("Type of member (user, list, string)", type,
- BUFSIZ, "user")) )
+ type = strsave("USER");
+ if (GetTypeFromUser("Type of member", "member", &type) == SUB_ERROR)
return(DM_NORMAL);
sprintf(buf, "Name of %s", type);
- if ( !(PromptWithDefault(buf, name, BUFSIZ, user)) ) {
- return(DM_NORMAL);
- }
+ name = strsave(user);
+ if (GetValueFromUser(buf, &name) == SUB_ERROR)
+ return(DM_NORMAL);
if (!ValidName(name))
return(DM_NORMAL);
Bool maillist, group;
struct qelem *top, *elem;
- if ( !(PromptWithDefault("Type of member (user, list, string)", buf,
- BUFSIZ, "user")) )
+ type = strsave("USER");
+ if (GetTypeFromUser("Type of member", "member", &type) == SUB_ERROR)
return(DM_NORMAL);
+
+ sprintf(buf, "Name of %s", type);
+ name = strsave(user);
+ if (GetValueFromUser(buf, &name) == SUB_ERROR)
+ return(DM_NORMAL);
/* What we really want is a recursive search */
- sprintf(temp_buf, "R%s", buf);
- type = Strsave(temp_buf);
+ sprintf(temp_buf, "R%s", type);
+ free(type); type = Strsave(temp_buf);
- sprintf(temp_buf, "Name of %s", buf);
- if ( !(PromptWithDefault(temp_buf, buf, BUFSIZ, user)) ) {
- free(type);
- return(DM_NORMAL);
- }
- name = Strsave(buf);
-
- maillist = YesNoQuestion("Show Lists that are Maillists (y/n) ?",
- TRUE);
- group = YesNoQuestion("Show Lists that are Groups (y/n) ?", TRUE);
+ if ((maillist = YesNoQuestion("Show Lists that are Maillists (y/n) ?",
+ TRUE)) == -1)
+ return(DM_NORMAL);
+ if ((group = YesNoQuestion("Show Lists that are Groups (y/n) ?",
+ TRUE)) == -1)
+ return(DM_NORMAL);
elem = top = GetListInfo(GLOM, type, name);
char buf[BUFSIZ], temp_buf[BUFSIZ], *type, *name;
struct qelem *top;
- if ( !(PromptWithDefault("Type of member (user, list, string)", buf,
- BUFSIZ, "user")) )
+ type = strsave("USER");
+ if (GetTypeFromUser("Type of member", "member", &type) == SUB_ERROR)
return(DM_NORMAL);
-
- if ( YesNoQuestion("Do you want a recursive search (y/n)", FALSE) == 1 ) {
- sprintf(temp_buf, "R%s", buf); /* "USER" to "RUSER" etc. */
- type = Strsave(temp_buf);
- }
- else
- type = Strsave(buf);
- sprintf(temp_buf, "Name of %s", buf);
- if ( !(PromptWithDefault(temp_buf, buf, BUFSIZ, user)) ) {
+ sprintf(buf, "Name of %s", type);
+ name = strsave(user);
+ if (GetValueFromUser(buf, &name) == SUB_ERROR)
+ return(DM_NORMAL);
+
+ switch (YesNoQuestion("Do you want a recursive search (y/n)", FALSE)) {
+ case TRUE:
+ sprintf(temp_buf, "R%s", type); /* "USER" to "RUSER" etc. */
free(type);
+ type = Strsave(temp_buf);
+ break;
+ case FALSE:
+ break;
+ default:
return(DM_NORMAL);
}
- name = Strsave(buf);
-
+
top = GetListInfo(ACE_USE, type, name);
Loop(top, PrintListAce);
return (DM_NORMAL);
}
-/* Function Name: ListAllGroups
- * Description: This function lists all visable groups.
- * Arguments: none.
- * Returns: DM_NORMAL.
- */
-
-ListAllGroups()
-{
- register int status;
- static char * args[] = {
- "TRUE", /* active */
- "DONTCARE", /* public */
- "FALSE", /* hidden */
- "DONTCARE", /* maillist */
- "TRUE", /* group. */
- };
-
- if (YesNoQuestion("This query will take a while, Do you wish to continue?",
- TRUE) == TRUE )
- if (status = do_mr_query("qualified_get_lists", 5, args,
- Print, (char *) NULL) != 0)
- com_err(program_name, status, " in ListAllGroups");
- return (DM_NORMAL);
-}
-
-/* Function Name: ListAllMailLists
- * Description: This function lists all visable maillists.
- * Arguments: none
- * Returns: DM_NORMAL.
- */
-
-ListAllMailLists()
-{
- register int status;
- static char * args[] = {
- "TRUE", /* active */
- "DONTCARE", /* public */
- "FALSE", /* hidden */
- "TRUE", /* maillist */
- "DONTCARE", /* group. */
- };
-
- if (YesNoQuestion("This query will take a while. Do you wish to continue?",
- TRUE) == TRUE )
- if (status = do_mr_query("qualified_get_lists", 5, args,
- Print, (char *) NULL) != 0)
- com_err(program_name, status, " in ListAllGroups");
-
- return (DM_NORMAL);
-}
-
/* Function Name: ListAllPublicMailLists
* Description: This function lists all public mailing lists.
* Arguments: none