summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>1996-11-10 08:02:17 +0000
committerTom Yu <tlyu@mit.edu>1996-11-10 08:02:17 +0000
commit6f731ceeeb3bcb27dc3c9450eacd3e1162b69a2a (patch)
tree3ec3325a3d1fb878a2a9b83570ae82fde506e7d4
parent863b2b98fd2e29b1427282ceee95606383e6c1ff (diff)
downloadkrb5-6f731ceeeb3bcb27dc3c9450eacd3e1162b69a2a.tar.gz
krb5-6f731ceeeb3bcb27dc3c9450eacd3e1162b69a2a.tar.xz
krb5-6f731ceeeb3bcb27dc3c9450eacd3e1162b69a2a.zip
* 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
-rw-r--r--src/appl/bsd/ChangeLog5
-rw-r--r--src/appl/bsd/login.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 7d53a211b..cc009a275 100644
--- 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 6793d10cb..7542a23a8 100644
--- 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,