From eedf4cefae65945f948aef246a31674f69ad5cec Mon Sep 17 00:00:00 2001 From: rpm-build Date: May 04 2021 22:51:45 +0000 Subject: Ignore-bad-enctypes-in-krb5_string_to_keysalts.patch patch_name: Ignore-bad-enctypes-in-krb5_string_to_keysalts.patch present_in_specfile: true location_in_specfile: 27 --- diff --git a/src/lib/kadm5/str_conv.c b/src/lib/kadm5/str_conv.c index 7cf51d3..7982956 100644 --- a/src/lib/kadm5/str_conv.c +++ b/src/lib/kadm5/str_conv.c @@ -340,9 +340,10 @@ krb5_string_to_keysalts(const char *string, const char *tupleseps, while ((ksp = strtok_r(p, tseps, &tlasts)) != NULL) { /* Pass a null pointer to subsequent calls to strtok_r(). */ p = NULL; - ret = string_to_keysalt(ksp, ksaltseps, &etype, &stype); - if (ret) - goto cleanup; + + /* Discard unrecognized keysalts. */ + if (string_to_keysalt(ksp, ksaltseps, &etype, &stype) != 0) + continue; /* Ignore duplicate keysalts if caller asks. */ if (!dups && krb5_keysalt_is_present(ksalts, nksalts, etype, stype))