diff options
| author | Theodore Tso <tytso@mit.edu> | 1994-10-26 23:35:10 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1994-10-26 23:35:10 +0000 |
| commit | e1b993fff76b6eb057cec769d5a88eb73fbed48f (patch) | |
| tree | bc91bf808182ecbf3208b61ef8b009ca59955d00 | |
| parent | f4f40814c59b4d698b1f8766dcc42aedf43f77c7 (diff) | |
If the requested kvno is IGNORE_KVNO, fix the error return so that 0
(no error) is returned instead of KTF_NOT_FOUND.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4583 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/keytab/file/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/krb5/keytab/file/ktf_get_en.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index ef318125b..33507d2b8 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,9 @@ +Wed Oct 26 14:41:31 1994 (tytso@rsx-11) + + * ktf_get_en.c (krb5_ktfile_get_entry): If the requested kvno is + IGNORE_KVNO, fix the error return so that 0 (no error) is + returned instead of KTF_NOT_FOUND. + Thu Oct 13 17:26:12 1994 Theodore Y. Ts'o (tytso@maytag) * configure.in: Add ISODE_DEFS diff --git a/src/lib/krb5/keytab/file/ktf_get_en.c b/src/lib/krb5/keytab/file/ktf_get_en.c index a1c18fc10..fce13c840 100644 --- a/src/lib/krb5/keytab/file/ktf_get_en.c +++ b/src/lib/krb5/keytab/file/ktf_get_en.c @@ -74,9 +74,9 @@ OLDDECLARG(krb5_keytab_entry *, entry) krb5_kt_free_entry(&new_entry); } } + if (kerror == KRB5_KT_END) + kerror = cur_entry.principal ? 0 : KRB5_KT_NOTFOUND; if (kerror) { - if (kerror == KRB5_KT_END) - kerror = KRB5_KT_NOTFOUND; (void) krb5_ktfileint_close(id); krb5_kt_free_entry(&cur_entry); return kerror; |