aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2023-07-08 03:09:18 +0000
committerMark Johnston <markj@FreeBSD.org>2023-08-01 19:50:30 +0000
commit9b45d8eddfac906d9f78a84a9954f74c222a4ee2 (patch)
tree79ce007f7f37429c53712d21ced6f92bcc55db9d
parent08b87f63a046bd966bd0ed548211ae98ff50e638 (diff)
pam_krb5: Add missing patch
Include a portion of the patch that was missed in 813847e49e35. Reported by: markj Fixes: 813847e49e35 (cherry picked from commit bfa51318dee8afd9307f15e49a6a521938dccd06) (cherry picked from commit d295e418ae7e60d87af6576ecdfad41a98d7442c) Approved by: so Security: FreeBSD-SA-23:09.pam_krb5 Security: CVE-2023-3326
-rw-r--r--lib/libpam/modules/pam_krb5/pam_krb5.c12
1 files changed, 0 insertions, 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);