summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/appl/telnet/libtelnet/ChangeLog5
-rw-r--r--src/appl/telnet/libtelnet/kerberos5.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 9b331f00f..9c19cb5fb 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 18 15:19:26 1994 Theodore Y. Ts'o (tytso@dcl)
+
+ * kerberos5.c (kerberos5_init): Initialize magic variable and
+ encryption type.
+
Fri Nov 18 00:37:13 1994 Mark Eichin <eichin@cygnus.com>
* configure.in: use WITH_KRB4. (from epeisach)
diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index 3ba19b7f3..be8f93709 100644
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -165,6 +165,8 @@ kerberos5_init(ap, server)
else
str_data[3] = TELQUAL_IS;
memset(&session_key, 0, sizeof(session_key));
+ session_key.magic = KV5M_MAGIC;
+ session_key.etype = ETYPE_UNKNOWN;
krb5_init_ets();
return(1);
}
@@ -246,9 +248,9 @@ kerberos5_send(ap)
authenticator.subkey = 0;
#ifdef ENCRYPTION
- if (session_key.contents)
- free(session_key.contents);
if (newkey) {
+ if (session_key.contents)
+ free(session_key.contents);
/* keep the key in our private storage, but don't use it
yet---see kerberos5_reply() below */
if (newkey->keytype != KEYTYPE_DES) {