|
 |
677019 |
From e57cdf6610f0b7c8ac38f9b2342b74b8c9e5bc54 Mon Sep 17 00:00:00 2001
|
|
|
10fa70 |
From: Greg Hudson <ghudson@mit.edu>
|
|
|
10fa70 |
Date: Sun, 26 Apr 2020 19:55:54 -0400
|
|
|
10fa70 |
Subject: [PATCH] Pass gss_localname() through SPNEGO
|
|
|
10fa70 |
|
|
|
10fa70 |
ticket: 8897 (new)
|
|
|
10fa70 |
(cherry picked from commit f7b8a6432bd289bdc528017be122305f95b8e285)
|
|
|
10fa70 |
(cherry picked from commit 646212314a580a8cdffdacda9cb3c8f806471b08)
|
|
|
10fa70 |
---
|
|
|
10fa70 |
src/lib/gssapi/spnego/gssapiP_spnego.h | 8 ++++++++
|
|
|
10fa70 |
src/lib/gssapi/spnego/spnego_mech.c | 9 ++++++++-
|
|
|
10fa70 |
2 files changed, 16 insertions(+), 1 deletion(-)
|
|
|
10fa70 |
|
|
|
10fa70 |
diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h
|
|
|
10fa70 |
index a93763314..066ec736f 100644
|
|
|
10fa70 |
--- a/src/lib/gssapi/spnego/gssapiP_spnego.h
|
|
|
10fa70 |
+++ b/src/lib/gssapi/spnego/gssapiP_spnego.h
|
|
|
10fa70 |
@@ -357,6 +357,14 @@ OM_uint32 KRB5_CALLCONV spnego_gss_wrap_size_limit
|
|
|
10fa70 |
OM_uint32 *max_input_size
|
|
|
10fa70 |
);
|
|
|
10fa70 |
|
|
|
10fa70 |
+OM_uint32 KRB5_CALLCONV spnego_gss_localname
|
|
|
10fa70 |
+(
|
|
|
10fa70 |
+ OM_uint32 *minor_status,
|
|
|
10fa70 |
+ const gss_name_t pname,
|
|
|
10fa70 |
+ const gss_const_OID mech_type,
|
|
|
10fa70 |
+ gss_buffer_t localname
|
|
|
10fa70 |
+);
|
|
|
10fa70 |
+
|
|
|
10fa70 |
OM_uint32 KRB5_CALLCONV spnego_gss_get_mic
|
|
|
10fa70 |
(
|
|
|
10fa70 |
OM_uint32 *minor_status,
|
|
|
10fa70 |
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
|
|
|
10fa70 |
index ec0bae6a4..594fc5894 100644
|
|
|
10fa70 |
--- a/src/lib/gssapi/spnego/spnego_mech.c
|
|
|
10fa70 |
+++ b/src/lib/gssapi/spnego/spnego_mech.c
|
|
|
10fa70 |
@@ -237,7 +237,7 @@ static struct gss_config spnego_mechanism =
|
|
|
10fa70 |
spnego_gss_inquire_context, /* gss_inquire_context */
|
|
|
10fa70 |
NULL, /* gss_internal_release_oid */
|
|
|
10fa70 |
spnego_gss_wrap_size_limit, /* gss_wrap_size_limit */
|
|
|
10fa70 |
- NULL, /* gssd_pname_to_uid */
|
|
|
10fa70 |
+ spnego_gss_localname,
|
|
|
10fa70 |
NULL, /* gss_userok */
|
|
|
10fa70 |
NULL, /* gss_export_name */
|
|
|
10fa70 |
spnego_gss_duplicate_name, /* gss_duplicate_name */
|
|
|
10fa70 |
@@ -2371,6 +2371,13 @@ spnego_gss_wrap_size_limit(
|
|
|
10fa70 |
return (ret);
|
|
|
10fa70 |
}
|
|
|
10fa70 |
|
|
|
10fa70 |
+OM_uint32 KRB5_CALLCONV
|
|
|
10fa70 |
+spnego_gss_localname(OM_uint32 *minor_status, const gss_name_t pname,
|
|
|
10fa70 |
+ const gss_const_OID mech_type, gss_buffer_t localname)
|
|
|
10fa70 |
+{
|
|
|
10fa70 |
+ return gss_localname(minor_status, pname, GSS_C_NO_OID, localname);
|
|
|
10fa70 |
+}
|
|
|
10fa70 |
+
|
|
|
10fa70 |
OM_uint32 KRB5_CALLCONV
|
|
|
10fa70 |
spnego_gss_get_mic(
|
|
|
10fa70 |
OM_uint32 *minor_status,
|