diff options
| author | Richard Basch <probe@mit.edu> | 1996-05-09 15:57:58 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1996-05-09 15:57:58 +0000 |
| commit | 521af89ada0d14f3de4a9207616d21f6e690b171 (patch) | |
| tree | 2bc6b99847f39b888e079b211b81e65fa2f52115 /src/lib | |
| parent | 5149ccbabcc5dc478c34ed63e91a116e4a06c59a (diff) | |
| download | krb5-521af89ada0d14f3de4a9207616d21f6e690b171.tar.gz krb5-521af89ada0d14f3de4a9207616d21f6e690b171.tar.xz krb5-521af89ada0d14f3de4a9207616d21f6e690b171.zip | |
Don't skip keytab entries with kvno=0
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7949 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/keytab/file/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/keytab/file/ktf_g_ent.c | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index 385e254c8..3957f037f 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,8 @@ +Thu May 9 03:05:51 1996 Richard Basch <basch@lehman.com> + + * ktf_g_ent.c (krb5_ktfile_get_entry): don't skip over keytab + entries with kvno=0. + Tue Mar 19 22:28:43 1996 Richard Basch <basch@lehman.com> * ktf_g_ent.c (krb5_ktfile_get_entry): all des enctypes are equivalent diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c index 9a76ce4cd..4805d5c69 100644 --- a/src/lib/krb5/keytab/file/ktf_g_ent.c +++ b/src/lib/krb5/keytab/file/ktf_g_ent.c @@ -81,16 +81,17 @@ krb5_ktfile_get_entry(context, id, principal, kvno, enctype, entry) (entry_type == enctype))&& krb5_principal_compare(context, principal, new_entry.principal)) { if (kvno == IGNORE_VNO) { - if (cur_entry.vno < new_entry.vno) { + if (! cur_entry.principal || + (cur_entry.vno < new_entry.vno)) + { krb5_kt_free_entry(context, &cur_entry); - cur_entry = new_entry; + cur_entry = new_entry; } } else { if (new_entry.vno == kvno) { -krb5_kt_free_entry(context, &cur_entry); - - cur_entry = new_entry; - break; + krb5_kt_free_entry(context, &cur_entry); + cur_entry = new_entry; + break; } } } else { |