fixed some defaults and messages

diff --git a/clients/moira/user.c b/clients/moira/user.c
index 51ff26a7cd3a1f8f397e9bc6d567c91ed69c9d9d..6f04d590abef476cff4a8998e5f470a748541918 100644 (file)
--- a/clients/moira/user.c
+++ b/clients/moira/user.c
@@ -35,6 +35,10 @@
 #define BY_NAME  2
 #define CLASS 3
 
+#define DEFAULT_SHELL "/bin/csh"
+#define DEFAULT_CLASS "?"
+
+
 /*     Function Name: UserState
  *     Description: Convert a numeric state into a descriptive string.
  *     Arguments: state value
@@ -110,13 +114,13 @@ char ** info;
 {
     info[U_NAME] = Strsave(UNIQUE_LOGIN);
     info[U_UID] = Strsave(UNIQUE_UID);
-    info[U_SHELL] = Strsave(DEFAULT_NONE);
+    info[U_SHELL] = Strsave(DEFAULT_SHELL);
     info[U_LAST] = Strsave(DEFAULT_NONE);
     info[U_FIRST] = Strsave(DEFAULT_NONE);
     info[U_MIDDLE] = Strsave(DEFAULT_NONE);
     info[U_STATE] = Strsave(DEFAULT_NO);
     info[U_MITID] = Strsave(DEFAULT_NONE);
-    info[U_CLASS] = Strsave(DEFAULT_NONE);
+    info[U_CLASS] = Strsave(DEFAULT_CLASS);
     info[U_MODTIME] = info[U_MODBY] = info[U_MODWITH] = info[U_END] = NULL;
     return(info);
 }
@@ -156,14 +160,15 @@ Bool name;
     GetValueFromUser("User's middle name", &info[U_MIDDLE]);
     GetValueFromUser("User's status", &info[U_STATE]);
     temp_ptr = Strsave(info[U_MITID]);
-    GetValueFromUser("User's (unencrypted) MIT ID number", &temp_ptr);
+    Put_message("User's MIT ID number (type a new unencrypted number, or keep same encryption)");
+    GetValueFromUser("", &temp_ptr);
     if ( strcmp( temp_ptr, info[U_MITID] ) != 0) {
        EncryptID(temp_buf, temp_ptr, info[U_FIRST], info[U_LAST]);
        free(info[U_MITID]);
        info[U_MITID] = Strsave(temp_buf);
     }
     free(temp_ptr);
-    GetValueFromUser("User's MIT Year (class)", &info[U_CLASS]);
+    GetTypeFromUser("User's MIT Year (class)", "class", &info[U_CLASS]);
     
     FreeAndClear(&info[U_MODTIME], TRUE);
     FreeAndClear(&info[U_MODBY], TRUE);