Minor optimization of ssh_krb5_kuserok

Resolves: rhbz#2112501
This commit is contained in:
Dmitry Belyavskiy 2023-08-03 11:06:10 +02:00
parent 8a294387d0
commit c7af8ecb76
2 changed files with 3 additions and 2 deletions

View File

@ -155,8 +155,8 @@ diff -up openssh-7.4p1/gss-serv-krb5.c.kuserok openssh-7.4p1/gss-serv-krb5.c
* because if they are on a krb5-protected filesystem, user credentials * because if they are on a krb5-protected filesystem, user credentials
* to access these files aren't available yet. */ * to access these files aren't available yet. */
- if (krb5_kuserok(krb_context, princ, name) && k5login_exists) { - if (krb5_kuserok(krb_context, princ, name) && k5login_exists) {
+ if (ssh_krb5_kuserok(krb_context, princ, name, k5login_exists) + if (k5login_exists &&
+ && k5login_exists) { + ssh_krb5_kuserok(krb_context, princ, name, k5login_exists)) {
retval = 1; retval = 1;
logit("Authorized to %s, krb5 principal %s (krb5_kuserok)", logit("Authorized to %s, krb5 principal %s (krb5_kuserok)",
name, (char *)client->displayname.value); name, (char *)client->displayname.value);

View File

@ -745,6 +745,7 @@ test -f %{sysconfig_anaconda} && \
- Split including crypto-policies to a separate config (rhbz#1970566) - Split including crypto-policies to a separate config (rhbz#1970566)
- Disable forking of ssh-agent on startup (rhbz#2148555) - Disable forking of ssh-agent on startup (rhbz#2148555)
- Remove sshd.socket unit (rhbz#2025716) - Remove sshd.socket unit (rhbz#2025716)
- Minor optimization of ssh_krb5_kuserok (rhbz#2112501)
* Tue Aug 01 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-7 * Tue Aug 01 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 9.3p1-7
- Relax checks of OpenSSL version - Relax checks of OpenSSL version