From 31791cff04ffdb29a3d07d0f721e3ab4a9b256d6 Mon Sep 17 00:00:00 2001 From: mar Date: Thu, 1 Sep 1988 16:05:58 +0000 Subject: [PATCH] Used typed input in some places --- clients/moira/lists.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/clients/moira/lists.c b/clients/moira/lists.c index 36ca2165..d193052d 100644 --- a/clients/moira/lists.c +++ b/clients/moira/lists.c @@ -202,8 +202,7 @@ Bool name; if (atoi(info[L_GROUP])) GetValueFromUser("What is the GID for this group.", &info[L_GID]); - GetValueFromUser("What Type of Administrator (none, user, list): ", - &info[L_ACE_TYPE]); + GetTypeFromUser("What Type of Administrator", "ace_type",&info[L_ACE_TYPE]); if ( (strcmp(info[L_ACE_TYPE], "USER") == 0) || (strcmp(info[L_ACE_TYPE], "user") == 0) ) GetValueFromUser("Who will be the administrator of this list: ", @@ -433,7 +432,7 @@ char **argv; return(DM_QUIT); case SMS_ACCESS: Put_message("You are not allowed to view this list."); - return(DM_QUIT); + break; default: com_err(program_name, stat, " in get_list_info"); return(DM_QUIT); @@ -561,18 +560,12 @@ char *action, **ret_argv; ret_argv[LM_LIST] = Strsave(current_list); - PromptWithDefault("Type of member (user, list, or string)", - ret_buf, BUFSIZ, "user"); - ret_argv[LM_TYPE]= Strsave(ret_buf); - -/* - * A type check needs to be added here, to see if we match the - * allowable types, currently (user, list, and string). - */ + ret_argv[LM_TYPE] = Strsave("user"); + GetTypeFromUser("Type of member", "member", &ret_argv[LM_TYPE]); sprintf(temp_buf,"Name of %s to %s", ret_argv[LM_TYPE], action); - PromptWithDefault(temp_buf, ret_buf, BUFSIZ, user); - ret_argv[LM_MEMBER] = Strsave(ret_buf); + ret_argv[LM_MEMBER] = Strsave(user); + GetValueFromUser(temp_buf, &ret_argv[LM_MEMBER]); ret_argv[LM_END] = NULL; /* NULL terminate this list. */ if (!ValidName( ret_argv[LM_MEMBER] ) ) { -- 2.45.2