Make the defaults be to *not* to get Kerberos V4 tickets. There are

currently bad interactions between defaulting and the default Kerberos
V4 realm (which is still hard-coded to be ATHENA.MIT.EDU).

Also added some miscelanneous code cleanups.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9249 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 4b69556450ff600e3f533f100b8aa9dd090a34e0..4628fd60104aada8b32a669830b1a113cd521eed 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,11 @@
+Tue Oct 29 10:09:39 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * login.c: Make the defaults be to *not* to get Kerberos V4
+               tickets.  There are currently bad interactions between
+               defaulting and the default Kerberos V4 realm (which is
+               still hard-coded to be ATHENA.MIT.EDU).
+               Also added some miscellaneous code cleanups.
+
 Mon Oct 21 13:44:53 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * kcmd.c: don't retry (and waste 7 seconds) on ECONNREFUSED, just

diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index 7514310cfc9db1144db72f5f02c761531a61799c..1f7240348593fd2dba25dd1c4afc121cc13f0528 100644 (file)
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -50,11 +50,11 @@ char copyright[] =
 int login_krb5_get_tickets = 1;
 #ifdef KRB5_KRB4_COMPAT
 #define KRB4_GET_TICKETS
-int login_krb4_get_tickets = 1;
+int login_krb4_get_tickets = 0;
 #define KRB4_CONVERT
 int login_krb4_convert = 0;
 #define KRB_RUN_AKLOG
-int login_krb_run_aklog = 1;
+int login_krb_run_aklog = 0;
 #endif /* KRB5_KRB4_COMPAT */
 int login_accept_passwd = 0;
 
@@ -156,6 +156,7 @@ typedef sigtype (*handler)();
 /* #include "krb5.h" */
 /* need k5-int.h to get ->profile from krb5_context */
 #include "k5-int.h"
+#include "com_err.h"
 #include "osconf.h"
 #endif /* KRB5_GET_TICKETS */
 
@@ -164,7 +165,7 @@ typedef sigtype (*handler)();
 #define KRB4
 #endif
 
-#ifdef KRB4_GET_TICKETS
+#if (defined(KRB4_GET_TICKETS) || defined(KRB4_CONVERT))
 /* support for prompting for v4 initial tickets */
 #define KRB4
 #endif
@@ -270,7 +271,7 @@ char term[64], *hostname, *username;
 
 extern int errno;
 
-#ifdef KRB4_GET_TICKETS
+#ifdef KRB4
 #define KRB_ENVIRON    "KRBTKFILE"     /* Ticket file environment variable */
 #define KRB_TK_DIR     "/tmp/tkt_"     /* Where to put the ticket */
 #endif /* KRB4_GET_TICKETS */
@@ -545,7 +546,7 @@ int try_krb5 (me_p, pass)
     /* set up credential cache -- obeying KRB5_ENV_CCNAME 
        set earlier */
     /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */
-    if (code = krb5_cc_default(kcontext, &ccache)) {
+    if ((code = krb5_cc_default(kcontext, &ccache))) {
        com_err("login", code, "while getting default ccache");
        return 0;
     }
@@ -1562,7 +1563,7 @@ int rewrite_ccache = 1; /*try to write out ccache*/
                    /* Maybe telnetd got tickets for us?  */
        if (!got_v5_tickets && have_v5_tickets (&me))
          got_v5_tickets = 1;
-#endif /*gET_KRB%_TICKETS/*/
+#endif /* GET_KRB_TICKETS */
 
 #ifdef KRB4_GET_TICKETS
        if ( login_krb4_convert && !got_v4_tickets) {