This version seems to to everything pretty well, deletes have been

rechecked, all references to allmaint have been sucessfully removed, menu
restructuring completed, still no kerberos support in register.

diff --git a/clients/moira/TODO b/clients/moira/TODO
index 10eff116a346dc7ce72be49fd6da9ed7c51465fd..f6e69c97da705759240fc00dfa1fb62f24aa5897 100644 (file)
--- a/clients/moira/TODO
+++ b/clients/moira/TODO
@@ -3,6 +3,10 @@
 BUGS
 ------------
 
+- Manual Page needs writing.
+
+- User Guide needs writing.
+
 - Test this on the RT.
 
 Minor Changes
@@ -26,6 +30,8 @@ Major Fixes and Additions
 -  Fix the D*** Menu Package.
    a) It loses when the machine runs out of memory.
 
+-  An online help system needs to be worked out.
+
 -  Add DCM Menu and functions.
 
 -  Add misc. Menu and functions.

diff --git a/clients/moira/user.c b/clients/moira/user.c
index 3a2f01c5bc4c13906ac646c9d8b4eeba22a3fd82..e19faea2bbc405792051c6d7db924ce0007a9366 100644 (file)
--- a/clients/moira/user.c
+++ b/clients/moira/user.c
@@ -546,7 +546,7 @@ int argc;
 char *argv[];
 {
     struct qelem *top;
-    char buf;
+    char buf[BUFSIZ];
 
     top = GetUserInfo(BY_NAME, argv[1], argv[2]);
 
@@ -554,10 +554,10 @@ char *argv[];
        return(DM_NORMAL);
 
     if (!PromptWithDefault("Print full information, or just the names (f/n)?",
-                          &buf, 1, "f"))
+                          buf, 1, "f"))
        return(DM_NORMAL);
 
-    switch(buf) {
+    switch(buf[0]) {
     case 'F':
     case 'f':
        Loop(top, PrintUserInfo);

diff --git a/clients/moira/utils.c b/clients/moira/utils.c
index 880d7689987c9f110bbe8f066074a47bbbb132c7..a8f72f25598a9fe1380999d1e7b5eef5287a9ac6 100644 (file)
--- a/clients/moira/utils.c
+++ b/clients/moira/utils.c
@@ -293,12 +293,12 @@ YesNoQuestion(prompt, bool_def)
 char *prompt;
 int bool_def;
 {
-    char ans;
+    char ans[2];
 
     while (TRUE) {
-       if (!PromptWithDefault(prompt, &ans, 1, bool_def ? "y" : "n"))
+       if (!PromptWithDefault(prompt, ans, 2, bool_def ? "y" : "n"))
            return(-1);
-       switch (ans) {
+       switch (ans[0]) {
        case 'n':
        case 'N':
            return(FALSE);
@@ -326,12 +326,12 @@ YesNoQuitQuestion(prompt, bool_def)
 char *prompt;
 int bool_def;
 {
-    char ans;
+    char ans[2];
 
     while (TRUE) {
-       if (!PromptWithDefault(prompt, &ans, 1, bool_def ? "y" : "n"))
+       if (!PromptWithDefault(prompt, ans, 2, bool_def ? "y" : "n"))
            return(-1);
-       switch (ans) {
+       switch (ans[0]) {
        case 'n':
        case 'N':
            return(FALSE);