diff options
| author | Mark Eichin <eichin@mit.edu> | 1995-04-26 23:57:11 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1995-04-26 23:57:11 +0000 |
| commit | f3270487114468ccb3cdd9574f9b5663bb2de081 (patch) | |
| tree | 8110016c04edea80e7e32020f3359bbdb40ee6c0 /src/appl | |
| parent | c0090025ecf76d8530ac8087527b46f0c70d804d (diff) | |
| download | krb5-f3270487114468ccb3cdd9574f9b5663bb2de081.tar.gz krb5-f3270487114468ccb3cdd9574f9b5663bb2de081.tar.xz krb5-f3270487114468ccb3cdd9574f9b5663bb2de081.zip | |
* 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
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/telnet/libtelnet/ChangeLog | 5 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/kerberos5.c | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog index 31aeb4c10..15498413b 100644 --- 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 af7a3cb4a..d6e51d535 100644 --- 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); |