The branch main has been updated by cy:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=bfa51318dee8afd9307f15e49a6a521938dccd06

commit bfa51318dee8afd9307f15e49a6a521938dccd06
Author:     Cy Schubert <c...@freebsd.org>
AuthorDate: 2023-07-08 03:09:18 +0000
Commit:     Cy Schubert <c...@freebsd.org>
CommitDate: 2023-07-08 03:09:18 +0000

    pam_krb5: Add missing patch
    
    Include a portion of the patch that was missed in 813847e49e35.
    
    Reported by:    markj
    Fixes:          813847e49e35
    MFC after:      1 day
---
 lib/libpam/modules/pam_krb5/pam_krb5.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c 
b/lib/libpam/modules/pam_krb5/pam_krb5.c
index 3972479a581f..3c7976297ed2 100644
--- a/lib/libpam/modules/pam_krb5/pam_krb5.c
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.c
@@ -938,18 +938,6 @@ verify_krb_v5_tgt_begin(krb5_context context, char 
*pam_service, int debug,
                        continue;
                break;
        }
-       if (retval != 0) {      /* failed to find key */
-               /* Keytab or service key does not exist */
-               if (debug) {
-                       const char *msg = krb5_get_error_message(context,
-                           retval);
-                       syslog(LOG_DEBUG,
-                           "pam_krb5: verify_krb_v5_tgt(): %s: %s",
-                           "krb5_kt_read_service_key()", msg);
-                       krb5_free_error_message(context, msg);
-               }
-               retval = 0;
-       }
        if (keyblock)
                krb5_free_keyblock(context, keyblock);
 

Reply via email to