From ede49f1719c3f0e4b1905c152a2e8f511aa0c86c Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Sun, 10 Apr 2011 17:47:53 +1000 Subject: [PATCH] gss_authorize_localname stub --- mech_eap/Makefile.am | 2 +- mech_eap/mech_eap.exports | 2 +- mech_eap/userok.c | 55 ----------------------------------------------- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 mech_eap/userok.c diff --git a/mech_eap/Makefile.am b/mech_eap/Makefile.am index 3bf752d..58d7b2c 100644 --- a/mech_eap/Makefile.am +++ b/mech_eap/Makefile.am @@ -24,6 +24,7 @@ mech_eap_la_SOURCES = \ acquire_cred_with_password.c \ add_cred.c \ add_cred_with_password.c \ + authorize_localname.c \ canonicalize_name.c \ compare_name.c \ context_time.c \ @@ -68,7 +69,6 @@ mech_eap_la_SOURCES = \ store_cred.c \ unwrap.c \ unwrap_iov.c \ - userok.c \ util_attr.cpp \ util_base64.c \ util_buffer.c \ diff --git a/mech_eap/mech_eap.exports b/mech_eap/mech_eap.exports index 449f013..3ba5892 100644 --- a/mech_eap/mech_eap.exports +++ b/mech_eap/mech_eap.exports @@ -2,6 +2,7 @@ gss_accept_sec_context gss_acquire_cred gss_add_cred gss_add_cred_with_password +gss_authorize_localname gss_canonicalize_name gss_compare_name gss_context_time @@ -41,7 +42,6 @@ gss_set_sec_context_option gss_store_cred gss_unwrap gss_unwrap_iov -gss_userok gss_verify_mic gss_wrap gss_wrap_iov diff --git a/mech_eap/userok.c b/mech_eap/userok.c deleted file mode 100644 index 9853992..0000000 --- a/mech_eap/userok.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2011, JANET(UK) - * 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 JANET(UK) 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 THE COPYRIGHT HOLDERS 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 THE COPYRIGHT HOLDER 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. - */ - -/* - * Local authorization services. - */ - -#include "gssapiP_eap.h" - -OM_uint32 KRB5_CALLCONV -gss_userok(OM_uint32 *minor, - const gss_name_t name GSSEAP_UNUSED, - const char *user GSSEAP_UNUSED, - int *user_ok) -{ - /* - * The MIT mechglue will fallback to comparing names in the absence - * of a mechanism implementation of gss_userok. To avoid this and - * force the mechglue to use attribute-based authorization, always - * return access denied here. - */ - - *minor = 0; - *user_ok = 0; - return GSS_S_COMPLETE; -} -- 2.1.4