Added krb5_keytype arg to krb5_kt_read_service_key() and krb5_kt_get_entry()

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 110e386ef5ffd92203b4845e37b6075573093804..c96d3be7e325b89238977717871f0d4e8f357132 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 27 00:56:12 1995  Chris Provenzano  (proven@mit.edu)
+
+       * func-proto.h (krb5_kt_read_service_key()) Added krb5_keytype arg.
+       * keytab.h (krb5_kt_get_entry()) Add krb5_keytype arg.
+
 Fri Jan 27 00:56:12 1995  Chris Provenzano  (proven@mit.edu)
 
        * base-defs.h Typedef krb5_boolean, krb5_msgtype, krb5_kvno,

diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index bf798c40da33527f982e3b6f0e9f24d7c75b140c..933fe1162235ebf82918bc81d38a04b702764395 100644 (file)
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -504,6 +504,7 @@ krb5_error_code krb5_kt_read_service_key
                   krb5_pointer,
                   krb5_principal,
                   krb5_kvno,
+                  krb5_keytype,
                   krb5_keyblock **));
 krb5_error_code krb5_mk_safe
        PROTOTYPE((krb5_context,

diff --git a/src/include/krb5/keytab.h b/src/include/krb5/keytab.h
index e8fb58b418467f4d1c48636f89c9fffdd3f6b151..a603b0cf1dd879708dbc1e4cbb80e261d6a0b953 100644 (file)
--- a/src/include/krb5/keytab.h
+++ b/src/include/krb5/keytab.h
@@ -71,6 +71,7 @@ typedef struct _krb5_kt_ops {
                    krb5_keytab,
                    krb5_principal,
                    krb5_kvno,
+                   krb5_keytype,
                    krb5_keytab_entry *));
     krb5_error_code (*start_seq_get) 
        NPROTOTYPE((krb5_context,
@@ -98,7 +99,7 @@ typedef struct _krb5_kt_ops {
 
 #define krb5_kt_get_name(context, keytab, name, namelen) (*(keytab)->ops->get_name)(context, keytab,name,namelen)
 #define krb5_kt_close(context, keytab) (*(keytab)->ops->close)(context, keytab)
-#define krb5_kt_get_entry(context, keytab, principal, vno, entry) (*(keytab)->ops->get)(context, keytab, principal, vno, entry)
+#define krb5_kt_get_entry(context, keytab, principal, vno, keytype, entry) (*(keytab)->ops->get)(context, keytab, principal, vno, keytype, entry)
 #define krb5_kt_start_seq_get(context, keytab, cursor) (*(keytab)->ops->start_seq_get)(context, keytab, cursor)
 #define krb5_kt_next_entry(context, keytab, entry, cursor) (*(keytab)->ops->get_next)(context, keytab, entry, cursor)
 #define krb5_kt_end_seq_get(context, keytab, cursor) (*(keytab)->ops->end_get)(context, keytab, cursor)