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 3e9042533de1db7670774ca8802478bde891dd07..4f29cffe6d5c886d6e03d37209fa0f23ee7972f8 100644 (file)
--- 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))