From 3f2c8e8fb0c2df20077b8fdf7964106b9f46a200 Mon Sep 17 00:00:00 2001 From: Chris Provenzano Date: Wed, 6 Sep 1995 19:14:36 +0000 Subject: [PATCH] * read_servi.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6725 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/keytab/ChangeLog | 3 +++ src/lib/krb5/keytab/read_servi.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index 4a853fdb7..a76291c80 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,6 @@ +Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) + + * read_servi.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g Tue Aug 29 13:37:56 EDT 1995 Paul Park (pjpark@mit.edu) * ktbase.c - Add routines to deal with externalizing krb5_keytab. These diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c index e18d199b4..a17443461 100644 --- a/src/lib/krb5/keytab/read_servi.c +++ b/src/lib/krb5/keytab/read_servi.c @@ -35,18 +35,18 @@ * effects: If keyprocarg is not NULL, it is taken to be the name of a * keytab. Otherwise, the default keytab will be used. This * routine opens the keytab and finds the principal associated with - * principal, vno, and keytype and returns the resulting key in *key + * principal, vno, and enctype and returns the resulting key in *key * or returning an error code if it is not found. * returns: Either KSUCCESS or error code. * errors: error code if not found or keyprocarg is invalid. */ krb5_error_code -krb5_kt_read_service_key(context, keyprocarg, principal, vno, keytype, key) +krb5_kt_read_service_key(context, keyprocarg, principal, vno, enctype, key) krb5_context context; krb5_pointer keyprocarg; krb5_principal principal; krb5_kvno vno; - krb5_keytype keytype; + krb5_enctype enctype; krb5_keyblock ** key; { krb5_error_code kerror = KSUCCESS; @@ -70,7 +70,7 @@ krb5_kt_read_service_key(context, keyprocarg, principal, vno, keytype, key) if ((kerror = krb5_kt_resolve(context, (char *)keytabname, &id))) return (kerror); - kerror = krb5_kt_get_entry(context, id, principal, vno, keytype, &entry); + kerror = krb5_kt_get_entry(context, id, principal, vno, enctype, &entry); krb5_kt_close(context, id); if (kerror) -- 2.26.2