From 8caba99986842fcbb32f3a87ba330ce282b0c21e Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 12 Feb 2003 00:06:37 +0000 Subject: [PATCH] * CCache-glue.c: Delete in_tkt() * change_password.c: Fix incorrect filename in comment. * g_in_tkt.c (krb_get_in_tkt_preauth): Call krb_in_tkt() rather than in_tkt(). git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15182 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb4/CCache-glue.c | 10 ---------- src/lib/krb4/ChangeLog | 7 +++++++ src/lib/krb4/change_password.c | 2 +- src/lib/krb4/g_in_tkt.c | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/lib/krb4/CCache-glue.c b/src/lib/krb4/CCache-glue.c index c0423dc30..05cb905fa 100644 --- a/src/lib/krb4/CCache-glue.c +++ b/src/lib/krb4/CCache-glue.c @@ -106,16 +106,6 @@ krb_in_tkt ( return KSUCCESS; } -int KRB5_CALLCONV -in_tkt( - char *name, - char *inst) -{ - char realm[REALM_SZ]; - krb_get_lrealm(realm, 1); - return krb_in_tkt(name, inst, realm); -} - int KRB5_CALLCONV krb_save_credentials( char *service, diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index a91123fb8..cdb6c1d4d 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,5 +1,12 @@ 2003-02-11 Tom Yu + * CCache-glue.c: Delete in_tkt(). + + * change_password.c: Fix incorrect filename in comment. + + * g_in_tkt.c (krb_get_in_tkt_preauth): Call krb_in_tkt() rather + than in_tkt(). + * CCache-glue.c (krb_in_tkt): Rename from in_tkt(). (in_tkt): Implement in terms of krb_in_tkt() to match existing Unix and Windows API. This shouldn't be a problem because it diff --git a/src/lib/krb4/change_password.c b/src/lib/krb4/change_password.c index 44882eaac..a92351e03 100644 --- a/src/lib/krb4/change_password.c +++ b/src/lib/krb4/change_password.c @@ -1,5 +1,5 @@ /* - * g_pw_in_tkt.c + * change_password.c * * Copyright 1987, 1988, 2002 by the Massachusetts Institute of * Technology. All Rights Reserved. diff --git a/src/lib/krb4/g_in_tkt.c b/src/lib/krb4/g_in_tkt.c index debfee4f4..a00ee47d9 100644 --- a/src/lib/krb4/g_in_tkt.c +++ b/src/lib/krb4/g_in_tkt.c @@ -496,7 +496,7 @@ krb_get_in_tkt_preauth(user, instance, realm, service, sinstance, life, arg, preauth_p, preauth_len, &creds, &laddr); if (retval != KSUCCESS) break; - if (in_tkt(user, instance) != KSUCCESS) { + if (krb_in_tkt(user, instance, realm) != KSUCCESS) { retval = INTK_ERR; break; } -- 2.26.2