diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-12-12 21:25:51 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-12-12 21:25:51 +0000 |
| commit | fb1227598fe0dd87d21f1ada456e0132c1dd3326 (patch) | |
| tree | 400f7417dd15d9f4739f711f19a8d590f8553cbf /src/appl | |
| parent | 9e06e2f27bfc68bbabacf78ea1d2932bee5b3770 (diff) | |
| download | krb5-fb1227598fe0dd87d21f1ada456e0132c1dd3326.zip krb5-fb1227598fe0dd87d21f1ada456e0132c1dd3326.tar.gz krb5-fb1227598fe0dd87d21f1ada456e0132c1dd3326.tar.bz2 | |
More KfM merge work
Create new file FSp-glue.c including KfM functions that had previously
been scattered through various other files.
Port RealmsConfig-glue.c from KfM, including old Unix-ish krb4
configuration code as fallback. Remove other files containing old
realm/config file support.
Add KRB5_CALLCONV to krb_get_in_tkt_creds.
Fix various functions to take const char* as arguments now that
tkt_string() returns const.
Assorted minor cleanup.
Implement krb_get_err_text in terms of com_err. Implement gross
kludge to force krb_err_txt to remain in sync with com_err.
ticket: 1189
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15046 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/telnet/libtelnet/ChangeLog | 7 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/kerberos.c | 6 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/strcasecmp.c | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog index add745a..17b61b5 100644 --- a/src/appl/telnet/libtelnet/ChangeLog +++ b/src/appl/telnet/libtelnet/ChangeLog @@ -1,3 +1,10 @@ +2002-12-12 Tom Yu <tlyu@mit.edu> + + * kerberos.c (kerberos4_send, kerberos4_is): Use + krb_get_err_text() instead of krb_err_txt array. + + * strcasecmp.c: Include sys/types.h rather than sys/cdefs.h. + 2002-11-15 Ezra Peisach <epeisach@bu.edu> * enc-proto.h, enc_des.c, encrypt.c: Unsigned/signed cleanups. diff --git a/src/appl/telnet/libtelnet/kerberos.c b/src/appl/telnet/libtelnet/kerberos.c index 3a72206..56a0731 100644 --- a/src/appl/telnet/libtelnet/kerberos.c +++ b/src/appl/telnet/libtelnet/kerberos.c @@ -242,11 +242,11 @@ kerberos4_send(ap) return(0); } if ((r = krb_mk_req(&kauth, KRB_SERVICE_NAME, instance, realm, 0))) { - printf("mk_req failed: %s\r\n", krb_err_txt[r]); + printf("mk_req failed: %s\r\n", krb_get_err_text(r)); return(0); } if ((r = krb_get_cred(KRB_SERVICE_NAME, instance, realm, &cred))) { - printf("get_cred failed: %s\r\n", krb_err_txt[r]); + printf("get_cred failed: %s\r\n", krb_get_err_text(r)); return(0); } if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) { @@ -395,7 +395,7 @@ kerberos4_is(ap, data, cnt) instance, 0, &adat, ""))) { if (auth_debug_mode) printf("Kerberos failed him as %s\r\n", name); - Data(ap, KRB_REJECT, (const void *)krb_err_txt[r], -1); + Data(ap, KRB_REJECT, (const void *)krb_get_err_text(r), -1); auth_finished(ap, AUTH_REJECT); return; } diff --git a/src/appl/telnet/libtelnet/strcasecmp.c b/src/appl/telnet/libtelnet/strcasecmp.c index 3c1140b..edd9f14 100644 --- a/src/appl/telnet/libtelnet/strcasecmp.c +++ b/src/appl/telnet/libtelnet/strcasecmp.c @@ -35,7 +35,7 @@ #define const #endif -#include <sys/cdefs.h> +#include <sys/types.h> #ifdef HAVE_STRING_H #include <string.h> #else |