summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2015-03-19 18:29:08 -0400
committerSimo Sorce <simo@redhat.com>2015-06-06 10:49:32 -0400
commitb7ff40d4e30e1ee79684abe3c76b781a0c21dc57 (patch)
treed55ac03f709b14ad3dd2a1be026990e9fc3bab76
parent160940319094d03a5f97d91f31b1e2f4228778c8 (diff)
downloadgss-ntlmssp-b7ff40d4e30e1ee79684abe3c76b781a0c21dc57.tar.gz
gss-ntlmssp-b7ff40d4e30e1ee79684abe3c76b781a0c21dc57.tar.xz
gss-ntlmssp-b7ff40d4e30e1ee79684abe3c76b781a0c21dc57.zip
Add placeholder inquire_nameHEADmaster
Otherwise in some cases MIT's GSSAPI can crash after trying to inquire a name. For example see: https://github.com/modauthgssapi/mod_auth_gssapi/issues/34 Signed-off-by: Simo Sorce <simo@redhat.com>
-rw-r--r--src/gss_names.c9
-rw-r--r--src/gss_ntlmssp.h6
-rw-r--r--src/gss_spi.c10
3 files changed, 25 insertions, 0 deletions
diff --git a/src/gss_names.c b/src/gss_names.c
index 1a35ed2..a663d21 100644
--- a/src/gss_names.c
+++ b/src/gss_names.c
@@ -634,3 +634,12 @@ done:
*netbios_host = nb_computer_name;
return ret;
}
+
+uint32_t gssntlm_inquire_name(uint32_t *minor_status,
+ gss_name_t name,
+ int *name_is_MN,
+ gss_OID *MN_mech,
+ gss_buffer_set_t *attrs)
+{
+ return GSS_S_UNAVAILABLE;
+}
diff --git a/src/gss_ntlmssp.h b/src/gss_ntlmssp.h
index ae86a0c..9915465 100644
--- a/src/gss_ntlmssp.h
+++ b/src/gss_ntlmssp.h
@@ -415,4 +415,10 @@ uint32_t gssntlm_display_status(uint32_t *minor_status,
gss_OID mech_type,
uint32_t *message_context,
gss_buffer_t status_string);
+
+uint32_t gssntlm_inquire_name(uint32_t *minor_status,
+ gss_name_t name,
+ int *name_is_MN,
+ gss_OID *MN_mech,
+ gss_buffer_set_t *attrs);
#endif /* _GSS_NTLMSSP_H_ */
diff --git a/src/gss_spi.c b/src/gss_spi.c
index cb4b5a0..c03b1a9 100644
--- a/src/gss_spi.c
+++ b/src/gss_spi.c
@@ -408,3 +408,13 @@ OM_uint32 gss_display_status(OM_uint32 *minor_status,
return gssntlm_display_status(minor_status, status_value, status_type,
mech_type, message_context, status_string);
}
+
+OM_uint32 gss_inquire_name(OM_uint32 *minor_status,
+ gss_name_t name,
+ int *name_is_MN,
+ gss_OID *MN_mech,
+ gss_buffer_set_t *attrs)
+{
+ return gssntlm_inquire_name(minor_status, name, name_is_MN, MN_mech,
+ attrs);
+}