* kdb_xdr.c (krb5_dbe_search_enctype): Re-order booleans so that

	similar doesn't get checked unless (ktype >= 0) to avoid it being
	stack garbage.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10937 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 45d031571dfe2de8b8894b12466dec89edad0e48..f23bd613308e00e00c4fd7f9d86463933813fc5f 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 25 19:42:10 1998  Tom Yu  <tlyu@mit.edu>
+
+       * kdb_xdr.c (krb5_dbe_search_enctype): Re-order booleans so that
+       similar doesn't get checked unless (ktype >= 0) to avoid it being
+       stack garbage.
+
 Sun Aug 16 16:52:10 1998  Sam Hartman  <hartmans@utwig.mesas.com>
 
        * Makefile.in (SHLIB_EXPLIBS): Include $(LIBS) so building on AIX works

diff --git a/src/lib/kdb/kdb_xdr.c b/src/lib/kdb/kdb_xdr.c
index ecd583c4bb21afe80bc2085a5b7546fae0d3ac6e..a26b7f79da5a01d81b0eb7561d359c6157834723 100644 (file)
--- a/src/lib/kdb/kdb_xdr.c
+++ b/src/lib/kdb/kdb_xdr.c
@@ -755,7 +755,7 @@ krb5_dbe_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap)
                return(ret);
        }
 
-       if ((similar || (ktype < 0)) &&
+       if (((ktype < 0) || similar) &&
            ((db_stype == stype) || (stype < 0))) {
            if (kvno >= 0) {
                if (kvno == dbentp->key_data[i].key_data_kvno) {