Build without krb4 if it's unavailable.

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

diff --git a/clients/moira/user.c b/clients/moira/user.c
index 69ab7b73ab3fc7e89ccab91285bdc82cb5ab0068..a37f93d861f34f79597467f27c1c15da43ed2186 100644 (file)
--- a/clients/moira/user.c
+++ b/clients/moira/user.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <time.h>
 
-#include <krb.h>
-
 RCSID("$Header$");
 
 void CorrectCapitalization(char **name);
@@ -42,9 +40,9 @@ struct mqelem *GetUserBySponsor(char *type, char *name);
 #define ID 4
 
 #ifdef ATHENA
-#define DEFAULT_SHELL "/bin/athena/tcsh"
+#define DEFAULT_SHELL "/bin/athena/bash"
 #else
-#define DEFAULT_SHELL "/bin/csh"
+#define DEFAULT_SHELL "/bin/bash"
 #endif
 #define DEFAULT_CLASS "?"
 
@@ -643,7 +641,7 @@ int RegisterUser(int argc, char **argv)
       FreeInfo(args);
       return DM_NORMAL;
     }
-  if (strcmp(potype, "POP") && strcmp(potype, "IMAP"))
+  if (strcmp(potype, "POP") && strcmp(potype, "IMAP") && strcmp(potype, "EXCHANGE"))
     {
       sprintf(temp_buf, "Unknown P.O. Box type.");
       Put_message(temp_buf);
@@ -1181,7 +1179,7 @@ int UserBySponsor(int argc, char **argv)
   struct mqelem *top;
 
   type = strdup("USER");
-  if (GetTypeFromUser("Type of sponsor", "ace_type", &type) == SUB_ERROR)
+  if (GetTypeFromUser("Type of sponsor", "search_ace_type", &type) == SUB_ERROR)
     return DM_NORMAL;
 
   sprintf(buf, "Name of %s", type);