Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: binary
MIME-Version: 1.0
X-Mailer: MIME-tools 5.420 (Entity 5.420)
Subject: Do not permit salttype after a lookup to be assigned "Ignore 
 salttype"
X-RT-Original-Encoding: iso-8859-1
Content-Length: 609

Index: str_conv.c
===================================================================
--- str_conv.c  (revision 20163)
+++ str_conv.c  (working copy)

@@ -346,6 +346,9 @@
                    krb5_xfree(savep);
                }
+                if (stype == -1)
+                    stype == KRB5_KDB_SALT_TYPETYPE_NORMAL;
+
                /* Save our values */
                (*ksaltp)[(*nksaltp)].ks_enctype = ktype;
                (*ksaltp)[(*nksaltp)].ks_salttype = stype;

Instead of setting the ks_salttype field to -1 which is an invalid
salttype, we default to using the normal salt type instead.