summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1995-04-22 04:54:47 +0000
committerTheodore Tso <tytso@mit.edu>1995-04-22 04:54:47 +0000
commitcb64f4d641fdf2b4813dd4d1c11805264a9466e7 (patch)
tree75955e0725cffa0b7fe4ab292fb55c760294952e /src
parent5b6779a2b8630f8a67ab880c2a4e58ff93bd1de4 (diff)
downloadkrb5-cb64f4d641fdf2b4813dd4d1c11805264a9466e7.tar.gz
krb5-cb64f4d641fdf2b4813dd4d1c11805264a9466e7.tar.xz
krb5-cb64f4d641fdf2b4813dd4d1c11805264a9466e7.zip
Only call krb5_init_context if the telnet context hasn't been
initialized yet. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5449 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/appl/telnet/libtelnet/ChangeLog5
-rw-r--r--src/appl/telnet/libtelnet/kerberos5.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index abe3422fad..a9a555b616 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 22 00:50:14 1995 Theodore Y. Ts'o (tytso@dcl)
+
+ * kerberos5.c (kerberos5_init): Only call krb5_init_context if
+ the telnet context hasn't been initialized yet.
+
Thu Apr 20 20:12:32 1995 Mark Eichin <eichin@cygnus.com>
Changes for testsuite from Ian Taylor <ian@cygnus.com>
diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index 268bdb345e..5f1685e650 100644
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -154,7 +154,7 @@ Data(ap, type, d, c)
return(net_write(str_data, p - str_data));
}
-krb5_context telnet_context;
+krb5_context telnet_context = 0;
int
kerberos5_init(ap, server)
Authenticator *ap;
@@ -167,7 +167,8 @@ kerberos5_init(ap, server)
memset(&session_key, 0, sizeof(session_key));
session_key.magic = KV5M_KEYBLOCK;
session_key.etype = ETYPE_UNKNOWN;
- krb5_init_context(&telnet_context);
+ if (telnet_context == 0)
+ krb5_init_context(&telnet_context);
krb5_init_ets(telnet_context);
return(1);
}