* kerberos5.c (kerberos5_is): use kt_resolve to get keytab, to

	correspond to current interface to rd_req.

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

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 31aeb4c10864f58161e0cd6c1c5c3cafac766dc6..15498413b4c1b647339b62276f7ec2431b7dd211 100644 (file)
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 26 19:52:52 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * kerberos5.c (kerberos5_is): use kt_resolve to get keytab, to
+       correspond to current interface to rd_req.
+
 Tue Apr 25 21:23:28 1995  Chris Provenzano  (proven@mit.edu)
 
         * forward.c (rd_and_store_for_creds()) : Rewritten to use

diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index af7a3cb4a9354af2912178ab245900f0899be6f7..d6e51d5358d8ad3a63447487b32fb4bbf3dad83d 100644 (file)
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -344,13 +344,20 @@ kerberos5_is(ap, data, cnt)
                
                if (!r) {
                    krb5_rcache rcache;
+                   krb5_keytab keytabid;
 
                    r = krb5_get_server_rcache(telnet_context,
                                        krb5_princ_component(telnet_context,
                                                             server, 0),
                                               &rcache);
-                   r = krb5_rd_req(telnet_context, &auth_context, &auth,
-                                   server, telnet_srvtab, NULL, &ticket);
+       
+                   if (!r)
+                     if (telnet_srvtab)
+                       r = krb5_kt_resolve(telnet_context, 
+                                           telnet_srvtab, &keytabid);
+                   if (!r)
+                     r = krb5_rd_req(telnet_context, &auth_context, &auth,
+                                     server, keytabid, NULL, &ticket);
                    if (rcache)
                        krb5_rc_close(telnet_context, rcache);
                    krb5_free_principal(telnet_context, server);