Subject: | Do not permit salttype after a lookup to be assigned "Ignore salttype" |
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.
===================================================================
--- 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.