From: Tom Yu <tlyu@mit.edu>
Date: Fri, 25 Sep 1998 23:43:46 +0000 (+0000)
Subject: 	* kdb_xdr.c (krb5_dbe_search_enctype): Re-order booleans so that
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cec03ce16b282341ae31e9cad708b1221e6662d;p=thirdparty%2Fkrb5.git

	* 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 45d031571d..f23bd61330 100644
--- 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 ecd583c4bb..a26b7f79da 100644
--- 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) {