X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/770464befa3da024efd7c9f267968a71a2b786ba..9e2516d6d1802890f163cd811348d4e4091a2173:/clients/moira/attach.c diff --git a/clients/moira/attach.c b/clients/moira/attach.c index 56936206..a3b850a4 100644 --- a/clients/moira/attach.c +++ b/clients/moira/attach.c @@ -24,13 +24,13 @@ #include #include #include +#include #include #include "mit-copyright.h" #include "defs.h" #include "f_defs.h" #include "globals.h" -#include "infodefs.h" #define FS_ALIAS_TYPE "FILESYS" @@ -39,16 +39,20 @@ #define GROUP 2 #define ALIAS 3 +#define NO_MACHINE ("\\[NONE\\]") /* C will remove one of the /'s here, + * and the other quotes the [ for + * ingres' regexp facility. */ + #define DEFAULT_TYPE ("NFS") #define DEFAULT_MACHINE DEFAULT_NONE #define DEFAULT_PACK DEFAULT_NONE #define DEFAULT_M_POINT DEFAULT_NONE -#define DEFAULT_ACCESS ("r") +#define DEFAULT_ACCESS ("w") #define DEFAULT_COMMENTS DEFAULT_COMMENT #define DEFAULT_OWNER (user) #define DEFAULT_OWNERS (user) #define DEFAULT_CREATE DEFAULT_YES -#define DEFAULT_L_TYPE ("HOMEDIR") +#define DEFAULT_L_TYPE ("PROJECT") /* Function Name: SetDefaults * Description: sets the default values for filesystem additions. @@ -94,22 +98,22 @@ char *name; switch (type) { case LABEL: - if ( (stat = sms_query("get_filesys_by_label", 1, &name, - StoreInfo, (char *)&elem)) != 0) { + if ( (stat = do_sms_query("get_filesys_by_label", 1, &name, + StoreInfo, (char *)&elem)) != 0) { com_err(program_name, stat, NULL); return(NULL); } break; case MACHINE: - if ( (stat = sms_query("get_filesys_by_machine", 1, &name, - StoreInfo, (char *)&elem)) != 0) { + if ( (stat = do_sms_query("get_filesys_by_machine", 1, &name, + StoreInfo, (char *)&elem)) != 0) { com_err(program_name, stat, NULL); return(NULL); } break; case GROUP: - if ( (stat = sms_query("get_filesys_by_group", 1, &name, - StoreInfo, (char *)&elem)) != 0) { + if ( (stat = do_sms_query("get_filesys_by_group", 1, &name, + StoreInfo, (char *)&elem)) != 0) { com_err(program_name, stat, NULL); return(NULL); } @@ -118,8 +122,8 @@ char *name; args[ALIAS_NAME] = name; args[ALIAS_TYPE] = FS_ALIAS_TYPE; args[ALIAS_TRANS] = "*"; - if ( (stat = sms_query("get_alias", 3, args, StoreInfo, - (char *) &elem)) != 0) { + if ( (stat = do_sms_query("get_alias", 3, args, StoreInfo, + (char *) &elem)) != 0) { com_err(program_name, stat, " in get_alias."); return(NULL); } @@ -146,6 +150,20 @@ char ** info; return(info[ALIAS_NAME]); } +static int fsgCount = 1; + +static char * +PrintFSGMembers(info) +char ** info; +{ + char print_buf[BUFSIZ]; + + sprintf(print_buf, " %d. Filesystem: %-32s (sort key: %s)", fsgCount++, info[0], info[1]); + Put_message(print_buf); + return(info[0]); +} + + /* Function Name: PrintFSInfo * Description: Prints the filesystem information. * Arguments: info - a pointer to the filesystem information. @@ -157,28 +175,53 @@ PrintFSInfo(info) char ** info; { char print_buf[BUFSIZ]; + FORMFEED; - sprintf(print_buf,"%20s Filesystem: %s", + sprintf(print_buf,"%20s Filesystem Group: %s", " ",info[FS_NAME]); Put_message(print_buf); - sprintf(print_buf,"Type: %-40s Machine: %-15s", - info[FS_TYPE], info[FS_MACHINE]); - Put_message(print_buf); - sprintf(print_buf,"Default Access: %-2s Packname: %-17s Mountpoint %s ", - info[FS_ACCESS], info[FS_PACK], info[FS_M_POINT]); - Put_message(print_buf); - sprintf(print_buf,"Comments; %s",info[FS_COMMENTS]); - Put_message(print_buf); - sprintf(print_buf, "User Ownership: %-30s Group Ownership: %s", - info[FS_OWNER], info[FS_OWNERS]); - Put_message(print_buf); - sprintf(print_buf, "Auto Create: %-34s Locker Type: %s", - atoi(info[FS_CREATE]) ? "ON" : "OFF", - info[FS_L_TYPE]); - Put_message(print_buf); - sprintf(print_buf, MOD_FORMAT, info[FS_MODBY], info[FS_MODTIME], - info[FS_MODWITH]); - Put_message(print_buf); + + if (!strcmp(info[FS_TYPE], "FSGROUP")) { + int stat; + struct qelem *elem = NULL; + + sprintf(print_buf,"Comments; %s",info[FS_COMMENTS]); + Put_message(print_buf); + sprintf(print_buf, MOD_FORMAT, info[FS_MODBY], info[FS_MODTIME], + info[FS_MODWITH]); + Put_message(print_buf); + Put_message("Containing the filesystems (in order):"); + if ((stat = do_sms_query("get_fsgroup_members", 1, &info[FS_NAME], + StoreInfo, (char *)&elem)) != 0) { + if (stat == SMS_NO_MATCH) + Put_message(" [no members]"); + else + com_err(program_name, stat, NULL); + } else { + fsgCount = 1; + Loop(QueueTop(elem), (void *) PrintFSGMembers); + FreeQueue(elem); + } + } else { + sprintf(print_buf,"Type: %-40s Machine: %-15s", + info[FS_TYPE], info[FS_MACHINE]); + Put_message(print_buf); + sprintf(print_buf,"Default Access: %-2s Packname: %-17s Mountpoint %s ", + info[FS_ACCESS], info[FS_PACK], info[FS_M_POINT]); + Put_message(print_buf); + sprintf(print_buf,"Comments; %s",info[FS_COMMENTS]); + Put_message(print_buf); + sprintf(print_buf, "User Ownership: %-30s Group Ownership: %s", + info[FS_OWNER], info[FS_OWNERS]); + Put_message(print_buf); + sprintf(print_buf, "Auto Create: %-34s Locker Type: %s", + atoi(info[FS_CREATE]) ? "ON" : "OFF", + info[FS_L_TYPE]); + Put_message(print_buf); + sprintf(print_buf, MOD_FORMAT, info[FS_MODBY], info[FS_MODTIME], + info[FS_MODWITH]); + Put_message(print_buf); + } return(info[FS_NAME]); } @@ -197,6 +240,7 @@ char ** info; Bool name; { char temp_buf[BUFSIZ], *newname; + int fsgroup = 0; Put_message(""); sprintf(temp_buf, "Changing Attributes of filesystem %s.", @@ -210,20 +254,30 @@ Bool name; &newname); } - GetValueFromUser("Filesystem's Type", &info[FS_TYPE]); - GetValueFromUser("Filesystem's Machine", &info[FS_MACHINE]); - strcpy(temp_buf, CanonicalizeHostname(info[FS_MACHINE])); - free(info[FS_MACHINE]); - info[FS_MACHINE] = Strsave(temp_buf); - GetValueFromUser("Filesystem's Pack Name", &info[FS_PACK]); - GetValueFromUser("Filesystem's Mount Point", &info[FS_M_POINT]); - GetValueFromUser("Filesystem's Default Access", &info[FS_ACCESS]); + GetTypeFromUser("Filesystem's Type", "filesys", &info[FS_TYPE]); + if (!strcmp(info[FS_TYPE], "FSGROUP") || !strcmp(info[FS_TYPE], "fsgroup")) + fsgroup++; + if (fsgroup) { + free(info[FS_MACHINE]); + info[FS_MACHINE] = Strsave(NO_MACHINE); + } else { + GetValueFromUser("Filesystem's Machine", &info[FS_MACHINE]); + strcpy(temp_buf, CanonicalizeHostname(info[FS_MACHINE])); + free(info[FS_MACHINE]); + info[FS_MACHINE] = Strsave(temp_buf); + } + if (!fsgroup) { + GetValueFromUser("Filesystem's Pack Name", &info[FS_PACK]); + GetValueFromUser("Filesystem's Mount Point", &info[FS_M_POINT]); + GetValueFromUser("Filesystem's Default Access", &info[FS_ACCESS]); + } GetValueFromUser("Comments about this Filesystem", &info[FS_COMMENTS]); GetValueFromUser("Filesystem's owner (user)", &info[FS_OWNER]); GetValueFromUser("Filesystem's owners (group)", &info[FS_OWNERS]); - GetYesNoValueFromUser("Automatically create this filsystem", - &info[FS_CREATE]); - GetValueFromUser("Filesystem's lockertype", &info[FS_L_TYPE]); + if (!fsgroup) + GetYesNoValueFromUser("Automatically create this filesystem", + &info[FS_CREATE]); + GetTypeFromUser("Filesystem's lockertype", "lockertype", &info[FS_L_TYPE]); FreeAndClear(&info[FS_MODTIME], TRUE); FreeAndClear(&info[FS_MODBY], TRUE); @@ -280,8 +334,8 @@ Bool one_item; sprintf(temp_buf, "Are you sure that you want to delete filesystem %s", info[FS_NAME]); if(!one_item || Confirm(temp_buf)) { - if ( (stat = sms_query("delete_filesys", 1, - &info[FS_NAME], Scream, NULL)) != 0) + if ( (stat = do_sms_query("delete_filesys", 1, + &info[FS_NAME], Scream, NULL)) != 0) com_err(program_name, stat, " filesystem not deleted."); else Put_message("Filesystem deleted."); @@ -325,12 +379,29 @@ Bool junk; { int stat; char ** args = AskFSInfo(info, TRUE); - - if ( (stat = sms_query("update_filesys", CountArgs(args), - args, NullFunc, NULL)) != 0) - com_err(program_name, stat, ", filesystem not updated"); - else - Put_message("filesystem sucessfully updated."); + extern Menu nfsphys_menu; + + stat = do_sms_query("update_filesys", CountArgs(args), args, + NullFunc, NULL); + switch (stat) { + case SMS_NFS: + Put_message("That NFS filesystem is not exported."); + if (YesNoQuestion("Fix this now (Y/N)")) { + Do_menu(&nfsphys_menu, 0, NULL); + if (YesNoQuestion("Retry filesystem update now (Y/N)")) { + if (stat = do_sms_query("update_filesys", CountArgs(args), args, + NullFunc, NULL)) + com_err(program_name, stat, " filesystem not updated"); + else + Put_message("filesystem sucessfully updated."); + } + } + break; + case SMS_SUCCESS: + break; + default: + com_err(program_name, stat, " in UpdateFS"); + } } /* Function Name: ChangeFS @@ -366,12 +437,13 @@ int argc; { char *info[MAX_ARGS_SIZE], **args; int stat; + extern Menu nfsphys_menu; if ( !ValidName(argv[1]) ) return(DM_NORMAL); - if ( (stat = sms_query("get_filesys_by_label", 1, argv + 1, - NullFunc, NULL)) == 0) { + if ( (stat = do_sms_query("get_filesys_by_label", 1, argv + 1, + NullFunc, NULL)) == 0) { Put_message ("A Filesystem by that name already exists."); return(DM_NORMAL); } else if (stat != SMS_NO_MATCH) { @@ -381,14 +453,234 @@ int argc; args = AskFSInfo(SetDefaults(info, argv[1]), FALSE ); - if ( (stat = sms_query("add_filesys", CountArgs(args), args, - NullFunc, NULL)) != 0) + stat = do_sms_query("add_filesys", CountArgs(args), args, NullFunc, NULL); + switch (stat) { + case SMS_NFS: + Put_message("That NFS filesystem is not exported."); + if (YesNoQuestion("Fix this now (Y/N)")) { + Do_menu(&nfsphys_menu, 0, NULL); + if (YesNoQuestion("Retry filesystem creation now (Y/N)")) { + if (stat = do_sms_query("add_filesys", CountArgs(args), args, + NullFunc, NULL)) + com_err(program_name, stat, " in AddFS"); + else + Put_message("Created."); + } + } + break; + case SMS_SUCCESS: + break; + default: com_err(program_name, stat, " in AddFS"); + } FreeInfo(info); return (DM_NORMAL); } +/* Function Name: SortAfter + * Description: choose a sortkey to cause an item to be added after + * the count element in the queue + * Arguments: queue of filesys names & sortkeys, queue count pointer + * Returns: sort key to use. + */ + +/* ARGSUSED */ +char * +SortAfter(elem, count) +struct qelem *elem; +int count; +{ + char *prev, *next, prevnext, *key, keybuf[9]; + + /* first find the two keys we need to insert between */ + prev = "A"; + for (; count > 0; count--) { + prev = ((char **)elem->q_data)[1]; + if (elem->q_forw) + elem = elem->q_forw; + else + break; + } + if (count > 0) + next = "Z"; + else + next = ((char **)elem->q_data)[1]; + + /* now copy the matching characters */ + for (key = keybuf; *prev && *prev == *next; next++) { + *key++ = *prev++; + } + + /* and set the last character */ + if (*prev == 0) + *prev = prevnext = 'A'; + else + prevnext = prev[1]; + if (prevnext == 0) + prevnext = 'A'; + if (*next == 0) + *next = 'Z'; + if (*next - *prev > 1) { + *key++ = (*next + *prev)/2; + } else { + *key++ = *prev; + *key++ = (prevnext + 'Z')/2; + } + *key = 0; + return(Strsave(keybuf)); +} + +/* Function Name: AddFSToGroup + * Description: add a filesystem to an FS group + * Arguments: arc, argv - name of group in argv[1], filesys in argv[2]. + * Returns: DM_NORMAL. + */ + +/* ARGSUSED */ +int +AddFSToGroup(argc, argv) +char **argv; +int argc; +{ + int stat, count; + struct qelem *elem = NULL; + char buf[BUFSIZ], *args[5], *bufp; + + if ((stat = do_sms_query("get_fsgroup_members", 1, argv+1, StoreInfo, + (char *)&elem)) != 0) { + if (stat != SMS_NO_MATCH) + com_err(program_name, stat, " in AddFSToGroup"); + } + if (elem == NULL) { + args[0] = argv[1]; + args[1] = argv[2]; + args[2] = "M"; + stat = do_sms_query("add_filesys_to_fsgroup", 3, args, Scream, NULL); + if (stat) + com_err(program_name, stat, " in AddFSToGroup"); + return(DM_NORMAL); + } + elem = QueueTop(elem); + fsgCount = 1; + Loop(elem, (void *) PrintFSGMembers); + sprintf(buf, "%d", QueueCount(elem)); + bufp = Strsave(buf); + stat = GetValueFromUser("Enter number of filesystem it should follow (0 to make it first):", &bufp); + count = atoi(bufp); + free(bufp); + args[2] = SortAfter(elem, count); + + FreeQueue(QueueTop(elem)); + args[0] = argv[1]; + args[1] = argv[2]; + stat = do_sms_query("add_filesys_to_fsgroup", 3, args, Scream, NULL); + if (stat == SMS_EXISTS) { + Put_message("That filesystem is already a member of the group."); + Put_message("Use the order command if you want to change the sorting order."); + } else if (stat) + com_err(program_name, stat, " in AddFSToGroup"); + return(DM_NORMAL); +} + + +/* Function Name: RemoveFSFromGroup + * Description: delete a filesystem from an FS group + * Arguments: arc, argv - name of group in argv[1]. + * Returns: DM_NORMAL. + */ + +/* ARGSUSED */ +int +RemoveFSFromGroup(argc, argv) +char **argv; +int argc; +{ + int stat; + char buf[BUFSIZ]; + + sprintf(buf, "Delete filesystem %s from FS group %s", argv[2], argv[1]); + if (!Confirm(buf)) + return(DM_NORMAL); + if ((stat = do_sms_query("remove_filesys_from_fsgroup", 2, argv+1, + Scream, NULL)) != 0) { + com_err(program_name, stat, ", not removed."); + } + return(DM_NORMAL); +} + +/* Function Name: ChangeFSGroupOrder + * Description: change the sortkey on a filesys in an FSgroup + * Arguments: arc, argv - name of group in argv[1]. + * Returns: DM_NORMAL. + */ + +/* ARGSUSED */ +int +ChangeFSGroupOrder(argc, argv) +char **argv; +int argc; +{ + int stat, src, dst; + struct qelem *elem = NULL, *top; + char buf[BUFSIZ], *bufp, *args[3]; + + if ((stat = do_sms_query("get_fsgroup_members", 1, argv+1, StoreInfo, + (char *)&elem)) != 0) { + if (stat == SMS_NO_MATCH) { + sprintf(buf, "Ether %s is not a filesystem group or it has no members", argv[1]); + Put_message(buf); + } else + com_err(program_name, stat, " in ChangeFSGroupOrder"); + return(DM_NORMAL); + } + top = QueueTop(elem); + fsgCount = 1; + Loop(top, (void *) PrintFSGMembers); + while (1) { + bufp = Strsave("1"); + stat = GetValueFromUser("Enter number of the filesystem to move:", + &bufp); + src = atoi(bufp); + free(bufp); + if (src < 0) { + Put_message("You must enter a positive number (or 0 to abort)."); + continue; + } else if (src == 0) { + Put_message("Aborted."); + return(DM_NORMAL); + } + for (elem = top; src-- > 1 && elem->q_forw; elem = elem->q_forw); + if (src > 1) { + Put_message("You entered a number that is too high"); + continue; + } + break; + } + bufp = Strsave("0"); + stat = GetValueFromUser("Enter number of filesystem it should follow (0 to make it first):", &bufp); + dst = atoi(bufp); + free(bufp); + if (src == dst || src == dst + 1) { + Put_message("That has no effect on the sorting order!"); + return(DM_NORMAL); + } + args[2] = SortAfter(top, dst); + args[0] = argv[1]; + args[1] = ((char **)elem->q_data)[0]; + if ((stat = do_sms_query("remove_filesys_from_fsgroup", 2, args, + Scream, NULL)) != 0) { + com_err(program_name, stat, " in ChangeFSGroupOrder"); + return(DM_NORMAL); + } + if ((stat = do_sms_query("add_filesys_to_fsgroup", 3, args, + Scream, NULL)) != 0) { + com_err(program_name, stat, " in ChangeFSGroupOrder"); + } + return(DM_NORMAL); +} + + /* -------------- Top Level Menu ---------------- */ /* Function Name: GetFSAlias @@ -415,7 +707,7 @@ char **argv; } /* Function Name: CreateFSAlias - * Description: Create an alias name for a filsystem + * Description: Create an alias name for a filesystem * Arguments: argc, argv - name of alias in argv[1]. * Returns: DM_NORMAL. * NOTES: This requires (name, type, transl) I get {name, translation} @@ -446,8 +738,8 @@ char **argv; * print out values, free memory used and then exit. */ - if ( (stat = sms_query("get_alias", 3, args, StoreInfo, - (char *)&elem)) == 0) { + if ( (stat = do_sms_query("get_alias", 3, args, StoreInfo, + (char *)&elem)) == 0) { top = elem = QueueTop(elem); while (elem != NULL) { info = (char **) elem->q_data; @@ -468,7 +760,7 @@ char **argv; GetValueFromUser("Which filesystem will this alias point to?", &args[ALIAS_TRANS]); - if ( (stat = sms_query("add_alias", 3, args, NullFunc, NULL)) != 0) + if ( (stat = do_sms_query("add_alias", 3, args, NullFunc, NULL)) != 0) com_err(program_name, stat, " in CreateFSAlias."); FreeInfo(args); @@ -499,8 +791,8 @@ Bool one_item; "Are you sure that you want to delete the filesystem alias %s", info[ALIAS_NAME]); if(!one_item || Confirm(temp_buf)) { - if ( (stat = sms_query("delete_alias", CountArgs(info), - info, Scream, NULL)) != 0 ) + if ( (stat = do_sms_query("delete_alias", CountArgs(info), + info, Scream, NULL)) != 0 ) com_err(program_name, stat, " filesystem alias not deleted."); else Put_message("Filesystem alias deleted."); @@ -510,7 +802,7 @@ Bool one_item; } /* Function Name: DeleteFSAlias - * Description: Delete an alias name for a filsystem + * Description: Delete an alias name for a filesystem * Arguments: argc, argv - name of alias in argv[1]. * Returns: DM_NORMAL. * NOTES: This requires (name, type, transl) I get {name, translation} @@ -540,28 +832,43 @@ int AttachHelp() { static char *message[] = { - "These are the options:\n\n", - "get - get information about a filesystem.\n", - "add - add a new filesystem to the data base.\n", - "update - update the information in the database on a filesystem.\n", - "delete - delete a filesystem from the database.\n", - "check - check information about association of a name and a filesys.\n", - "alias - associate a name with a filsystem.\n", - "unalias - disassociate a name with a filesystem.\n", - "verbose - toggle the request for delete confirmation.\n", + "These are the options:", + "", + "get - get information about a filesystem.", + "add - add a new filesystem to the data base.", + "update - update the information in the database on a filesystem.", + "delete - delete a filesystem from the database.", + "check - check information about association of a name and a filesys.", + "alias - associate a name with a filesystem.", + "unalias - disassociate a name with a filesystem.", + "verbose - toggle the request for delete confirmation.", NULL, }; return(PrintHelp(message)); } -/* - * Local Variables: - * mode: c - * c-indent-level: 4 - * c-continued-statement-offset: 4 - * c-brace-offset: -4 - * c-argdecl-indent: 4 - * c-label-offset: -4 - * End: +/* Function Name: FSGroupHelp + * Description: Print help info on fsgroups. + * Arguments: none + * Returns: DM_NORMAL. */ + +int +FSGroupHelp() +{ + static char *message[] = { + "A filesystem group is a named sorted list of filesystems.", + "", + "To create, modify, or delete a group itself, use the menu above", + " this one, and manipulate a filesystem of type FSGROUP.", + "Options here are:", + " get - get info about a group and show its members", + " add - add a new member to a group.", + " remove - remove a member from a group.", + " order - change the sorting order of a group.", + NULL + }; + + return(PrintHelp(message)); +}