* login.c (k_init): Set up KRBTKFILE if converting krb5 tickets to

	krb4 but not getting them via password.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 7d53a211b0aab16a12ea368dd99731473e3048d3..cc009a2758b7e6d9dda0ed678961579b3361a9ff 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -2,6 +2,11 @@ Sat Nov  9 10:49:36 1996  Sam Hartman  <hartmans@mit.edu>
 
        * login.c: Re-arrange to deal with compiling without krb4 support. [148]
 
+Fri Nov  8 20:59:27 1996  Tom Yu  <tlyu@mit.edu>
+
+       * login.c (k_init): Set up KRBTKFILE if converting krb5 tickets to
+       krb4 but not getting them via password.
+
 Wed Nov  6 11:32:36 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * login.c (destroy_tickets): Just use global kcontext instead

diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index 6793d10cb2c285acd17dd6a0f156e12ea44d4df1..7542a23a898ce4a70555f2e496acd7b0ea117de2 100644 (file)
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -494,7 +494,7 @@ void k_init (ttyn)
     if (krb_get_lrealm(realm, 1) != KSUCCESS) {
        strncpy(realm, KRB_REALM, sizeof(realm));
     }
-    if (login_krb4_get_tickets) {
+    if (login_krb4_get_tickets || login_krb4_convert) {
        /* Set up the ticket file environment variable */
        strncpy(tkfile, KRB_TK_DIR, sizeof(tkfile));
        strncat(tkfile, strrchr(ttyn, '/')+1,