diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-10-30 03:46:57 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-10-30 03:46:57 +0000 |
| commit | eec53e09342c1f51bec243d14f91dda7e423d058 (patch) | |
| tree | fe44fc124cea09cf3f54838a16338a29bffebd67 /src | |
| parent | d541ff2e751bae4fdb5c32a01eac9284ca4d24fa (diff) | |
| download | krb5-eec53e09342c1f51bec243d14f91dda7e423d058.tar.gz krb5-eec53e09342c1f51bec243d14f91dda7e423d058.tar.xz krb5-eec53e09342c1f51bec243d14f91dda7e423d058.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/bsd/ChangeLog | 8 | ||||
| -rw-r--r-- | src/appl/bsd/login.c | 13 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 4b6955645..4628fd601 100644 --- 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 7514310cf..1f7240348 100644 --- 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) { |