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

diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index ef318125bf37ff858f964c90ea6b2fc72ffb2ce6..33507d2b85f5d2513dabfa4c8b6dad733c7b47a7 100644 (file)
--- 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 a1c18fc107bf3d6214f5e15e9f3a41d82604d7e5..fce13c8407f0bdd0de8b2aeca5fe6bba04c607cc 100644 (file)
--- 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;