Diane Delgado's changes for a fixed table-locking order

[moira.git] / clients / moira / user.c

diff --git a/clients/moira/user.c b/clients/moira/user.c
index ff24c17664e6d80036e035d92ccee6143a93180e..e116804a2e1c43a58f1b26dc03337c391baf9a33 100644 (file)
--- a/clients/moira/user.c
+++ b/clients/moira/user.c
@@ -42,7 +42,11 @@
 #define CLASS 3
 #define ID 4
 
+#ifdef ATHENA
+#define DEFAULT_SHELL "/bin/athena/tcsh"
+#else
 #define DEFAULT_SHELL "/bin/csh"
+#endif
 #define DEFAULT_CLASS "?"
 
 
@@ -630,11 +634,16 @@ RegisterUser()
        return(DM_NORMAL);
     }
 
-    if ( ((login = args[1] = GetLoginName()) == NULL) ||
+    sprintf(temp_buf, "u%s", args[0]);
+    login = strsave(temp_buf);
+    if ( (GetValueFromUser("Login name for this user? ", &login) == SUB_ERROR) ||
        ( GetFSTypes(&fstype, FALSE) == SUB_ERROR ) ) {
+        args[1] = login;
        FreeInfo(args);    /* This work because the NULL temination is ok. */
        return(DM_NORMAL);
     }
+    Put_message("KERBEROS code not added, did not reserve name with kerberos.");
+    args[1] = login;
     args[2] = fstype;
     args[3] = NULL;