If the key version number is specified, check to make sure that the

entry has the correct key version number.

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

diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index 8de097a14dbc1955516433fb9db0f51d30e53c83..16ec9bf5b6063c54f52fe35bbb68b68b434ca6e3 100644 (file)
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 28 12:05:34 1995    <tytso@rsx-11.mit.edu>
+
+       * ktf_g_ent.c (krb5_ktfile_get_entry): If the key version number
+               is specified, check to make sure that the entry has the
+               correct key version number.
+
 Fri Jun  9 19:34:23 1995    <tytso@rsx-11.mit.edu>
 
        * configure.in: Remove standardized set of autoconf macros, which

diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c
index a296720ce8e60b5045ab66cf585082795ea98008..f05f0bd48bd5287f07b38dbdeb898a456f186abb 100644 (file)
--- a/src/lib/krb5/keytab/file/ktf_g_ent.c
+++ b/src/lib/krb5/keytab/file/ktf_g_ent.c
@@ -63,8 +63,10 @@ krb5_ktfile_get_entry(context, id, principal, kvno, keytype, entry)
                                cur_entry = new_entry;
                        }
                } else {
-                       cur_entry = new_entry;
-                       break;
+                       if (new_entry.vno == kvno) {
+                               cur_entry = new_entry;
+                               break;
+                       }
                }
        } else {
                krb5_kt_free_entry(context, &new_entry);