|
 |
2cb7d5 |
From 676ec5fe0b6c7c5126dbf84ef59ec4a5d5f87ede Mon Sep 17 00:00:00 2001
|
|
|
2cb7d5 |
From: rpm-build <rpm-build>
|
|
|
2cb7d5 |
Date: Tue, 26 Apr 2022 10:23:53 +0200
|
|
|
2cb7d5 |
Subject: [PATCH] Fix gss_localname with SPNEGO wrapping
|
|
|
2cb7d5 |
|
|
|
2cb7d5 |
Fix implemented upstream by Simo
|
|
|
2cb7d5 |
---
|
|
|
2cb7d5 |
src/mod_auth_gssapi.c | 14 ++++++++++++++
|
|
|
2cb7d5 |
1 file changed, 14 insertions(+)
|
|
|
2cb7d5 |
|
|
|
2cb7d5 |
diff --git a/src/mod_auth_gssapi.c b/src/mod_auth_gssapi.c
|
|
|
2cb7d5 |
index b0999737daedf88fa84a9d8b1543bbedc79194ab..c91aa60707ba9b237a84f95670d483f1a7eab86b 100644
|
|
|
2cb7d5 |
--- a/src/mod_auth_gssapi.c
|
|
|
2cb7d5 |
+++ b/src/mod_auth_gssapi.c
|
|
|
2cb7d5 |
@@ -1264,7 +1264,21 @@ static int mag_complete(struct mag_req_cfg *req_cfg, struct mag_conn *mc,
|
|
|
2cb7d5 |
#endif
|
|
|
2cb7d5 |
|
|
|
2cb7d5 |
if (cfg->map_to_local) {
|
|
|
2cb7d5 |
+ /* We have to play heuristics here as gss_localname does not work
|
|
|
2cb7d5 |
+ * as expected with SPNEGO-wrapped names.
|
|
|
2cb7d5 |
+ * http://krbdev.mit.edu/rt/Ticket/Display.html?id=8782
|
|
|
2cb7d5 |
+ */
|
|
|
2cb7d5 |
maj = gss_localname(&min, client, mech_type, &lname);
|
|
|
2cb7d5 |
+ if (maj != GSS_S_COMPLETE) {
|
|
|
2cb7d5 |
+ uint32_t sub_maj, sub_min;
|
|
|
2cb7d5 |
+ /* try fallback with no oid */
|
|
|
2cb7d5 |
+ sub_maj = gss_localname(&sub_min, client, GSS_C_NO_OID, &lname);
|
|
|
2cb7d5 |
+ if (sub_maj != GSS_S_UNAVAILABLE) {
|
|
|
2cb7d5 |
+ /* use second call errors only if they are meaningful */
|
|
|
2cb7d5 |
+ maj = sub_maj;
|
|
|
2cb7d5 |
+ min = sub_min;
|
|
|
2cb7d5 |
+ }
|
|
|
2cb7d5 |
+ }
|
|
|
2cb7d5 |
if (maj != GSS_S_COMPLETE) {
|
|
|
2cb7d5 |
mag_post_error(req, cfg, MAG_GSS_ERR, maj, min,
|
|
|
2cb7d5 |
"gss_localname() failed");
|
|
|
2cb7d5 |
--
|
|
|
2cb7d5 |
2.35.1
|
|
|
2cb7d5 |
|