From: Marc Horowitz <marc@mit.edu>
Date: Sun, 26 Jul 1998 01:53:51 +0000 (+0000)
Subject: don't skip a ks_tuple unless the enctype and salttype both match
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5edbdd3be10fda5d4c46c0a666d5805d3624b095;p=thirdparty%2Fkrb5.git

don't skip a ks_tuple unless the enctype and salttype both match
something prior in the list.

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

diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c
index 3e9042533d..4f29cffe6d 100644
--- a/src/lib/kdb/kdb_cpw.c
+++ b/src/lib/kdb/kdb_cpw.c
@@ -296,11 +296,12 @@ add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd,
 						 &similar)))
 		return(retval);
 
-	    if (similar)
+	    if (similar &&
+		(ks_tuple[j].ks_salttype == ks_tuple[i].ks_salttype))
 		break;
 	}
 
-	if (similar)
+	if (j == i)
 	    continue;
 
 	if (retval = krb5_dbe_create_key_data(context, db_entry))