From 42488823818249b1cb095051820a0f0a6b4f1766 Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Sat, 12 Mar 2011 12:49:42 -0800 Subject: [PATCH] drop gss_name_any since it removed from the draft --- lib/gssapi/gssapi/gssapi.h | 18 ----- lib/gssapi/gssapi_mech.h | 17 ----- lib/gssapi/mech/gss_map_name_to_any.c | 70 ------------------- lib/gssapi/mech/gss_mech_switch.c | 2 - .../mech/gss_release_any_name_mapping.c | 69 ------------------ 5 files changed, 176 deletions(-) delete mode 100644 lib/gssapi/mech/gss_map_name_to_any.c delete mode 100644 lib/gssapi/mech/gss_release_any_name_mapping.c diff --git a/lib/gssapi/gssapi/gssapi.h b/lib/gssapi/gssapi/gssapi.h index 920778ba1..caa1af8b3 100644 --- a/lib/gssapi/gssapi/gssapi.h +++ b/lib/gssapi/gssapi/gssapi.h @@ -1039,24 +1039,6 @@ GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_export_name_composite ( gss_buffer_t /* exp_composite_name */ ); -typedef struct gss_any *gss_any_t; - -GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_map_name_to_any ( - OM_uint32 *, /* minor_status */ - gss_name_t, /* name */ - int, /* authenticated */ - gss_buffer_t, /* type_id */ - gss_any_t * /* output */ - ); - -GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_release_any_name_mapping ( - OM_uint32 *, /* minor_status */ - gss_name_t, /* name */ - gss_buffer_t, /* type_id */ - gss_any_t * /* input */ - ); - - /* * */ diff --git a/lib/gssapi/gssapi_mech.h b/lib/gssapi/gssapi_mech.h index c9345700e..1431dbcee 100644 --- a/lib/gssapi/gssapi_mech.h +++ b/lib/gssapi/gssapi_mech.h @@ -439,21 +439,6 @@ typedef OM_uint32 GSSAPI_CALLCONV _gss_export_name_composite_t ( gss_buffer_t /* exp_composite_name */ ); -typedef OM_uint32 GSSAPI_CALLCONV _gss_map_name_to_any_t ( - OM_uint32 *, /* minor_status */ - gss_name_t, /* name */ - int, /* authenticated */ - gss_buffer_t, /* type_id */ - gss_any_t * /* output */ - ); - -typedef OM_uint32 GSSAPI_CALLCONV _gss_release_any_name_mapping_t ( - OM_uint32 *, /* minor_status */ - gss_name_t, /* name */ - gss_buffer_t, /* type_id */ - gss_any_t * /* input */ - ); - /* * */ @@ -542,8 +527,6 @@ typedef struct gssapi_mech_interface_desc { _gss_set_name_attribute_t *gm_set_name_attribute; _gss_delete_name_attribute_t *gm_delete_name_attribute; _gss_export_name_composite_t *gm_export_name_composite; - _gss_map_name_to_any_t *gm_map_name_to_any; - _gss_release_any_name_mapping_t *gm_release_any_name_mapping; } gssapi_mech_interface_desc, *gssapi_mech_interface; gssapi_mech_interface diff --git a/lib/gssapi/mech/gss_map_name_to_any.c b/lib/gssapi/mech/gss_map_name_to_any.c deleted file mode 100644 index 8f56eafc0..000000000 --- a/lib/gssapi/mech/gss_map_name_to_any.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2010, PADL Software Pty Ltd. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of PADL Software nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY PADL SOFTWARE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL PADL SOFTWARE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include "mech_locl.h" - -OM_uint32 -gss_map_name_to_any(OM_uint32 *minor_status, - gss_name_t input_name, - int authenticated, - gss_buffer_t type_id, - gss_any_t *output) -{ - OM_uint32 major_status = GSS_S_UNAVAILABLE; - struct _gss_name *name = (struct _gss_name *) input_name; - struct _gss_mechanism_name *mn; - - *minor_status = 0; - *output = (gss_any_t)0; - - if (input_name == GSS_C_NO_NAME) - return GSS_S_BAD_NAME; - - HEIM_SLIST_FOREACH(mn, &name->gn_mn, gmn_link) { - gssapi_mech_interface m = mn->gmn_mech; - - if (!m->gm_map_name_to_any) - continue; - - major_status = m->gm_map_name_to_any(minor_status, - mn->gmn_name, - authenticated, - type_id, - output); - if (GSS_ERROR(major_status)) - _gss_mg_error(m, major_status, *minor_status); - else - break; - } - - return major_status; -} diff --git a/lib/gssapi/mech/gss_mech_switch.c b/lib/gssapi/mech/gss_mech_switch.c index ccd497b7b..f7f75c13f 100644 --- a/lib/gssapi/mech/gss_mech_switch.c +++ b/lib/gssapi/mech/gss_mech_switch.c @@ -349,8 +349,6 @@ _gss_load_mech(void) OPTSYM(set_name_attribute); OPTSYM(delete_name_attribute); OPTSYM(export_name_composite); - OPTSYM(map_name_to_any); - OPTSYM(release_any_name_mapping); mi = dlsym(so, "gss_mo_init"); if (mi != NULL) { diff --git a/lib/gssapi/mech/gss_release_any_name_mapping.c b/lib/gssapi/mech/gss_release_any_name_mapping.c deleted file mode 100644 index 14a4dfa69..000000000 --- a/lib/gssapi/mech/gss_release_any_name_mapping.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2010, PADL Software Pty Ltd. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of PADL Software nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY PADL SOFTWARE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL PADL SOFTWARE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include "mech_locl.h" - -OM_uint32 -gss_release_any_name_mapping(OM_uint32 *minor_status, - gss_name_t input_name, - gss_buffer_t type_id, - gss_any_t *input) -{ - OM_uint32 major_status = GSS_S_UNAVAILABLE; - struct _gss_name *name = (struct _gss_name *) input_name; - struct _gss_mechanism_name *mn; - - *minor_status = 0; - - if (input_name == GSS_C_NO_NAME) - return GSS_S_BAD_NAME; - - HEIM_SLIST_FOREACH(mn, &name->gn_mn, gmn_link) { - gssapi_mech_interface m = mn->gmn_mech; - - if (!m->gm_release_any_name_mapping) - continue; - - major_status = m->gm_release_any_name_mapping(minor_status, - mn->gmn_name, - type_id, - input); - if (GSS_ERROR(major_status)) - _gss_mg_error(m, major_status, *minor_status); - else { - *input = (gss_any_t)0; - break; - } - } - - return major_status; -}