rel_oid.c (krb5_gss_internal_release_oid): Add the new interface for

	the mechglue layer.

inq_cred.c (krb5_gss_inquire_cred): Call gss_release_oid_set() instead
	of generic_gss_release_oid_set().

gssapiP_krb5.h: Added prototype for krb5_gss_internal_release_oid

Makefile.in (CCSRCS): Removed the file krb5_gss_glue.c and added the
	file k5mech.c and pname_to_uid.c

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7363 dc483132-0cff-0310-8789-dd5450dbe970

7 files changed, 61 insertions, 687 deletions

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 6d333906a..68ff7b801 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,16 @@
+Tue Jan 23 03:25:02 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* rel_oid.c (krb5_gss_internal_release_oid): Add the new interface
+		for the mechglue layer.
+
+	* inq_cred.c (krb5_gss_inquire_cred): Call gss_release_oid_set()
+		instead of generic_gss_release_oid_set().
+
+	* gssapiP_krb5.h: Added prototype for krb5_gss_internal_release_oid 
+
+	* Makefile.in (CCSRCS): Removed the file krb5_gss_glue.c and added
+		the file k5mech.c and pname_to_uid.c
+
 Tue Jan  9 22:11:25 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* gssapiP_krb5.h (KRB5_GSS_FOR_CREDS_OPTION): New constant added
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 1f95186c8..89db40572 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -35,7 +35,8 @@ CCSRCS = \
 	$(srcdir)/inq_names.c \
 	$(srcdir)/k5seal.c \
 	$(srcdir)/k5unseal.c \
-	$(srcdir)/krb5_gss_glue.c \
+	$(srcdir)/k5mech.c \
+	$(srcdir)/pname_to_uid.c \
 	$(srcdir)/process_context_token.c \
 	$(srcdir)/rel_cred.c \
 	$(srcdir)/rel_name.c \
@@ -70,7 +71,8 @@ CCOBJS = \
 	inq_names.$(OBJEXT) \
 	k5seal.$(OBJEXT) \
 	k5unseal.$(OBJEXT) \
-	krb5_gss_glue.$(OBJEXT) \
+	k5mech.$(OBJEXT) \
+	pname_to_uid.$(OBJEXT) \
 	process_context_token.$(OBJEXT) \
 	rel_cred.$(OBJEXT) \
 	rel_name.$(OBJEXT) \
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index c0f3b70fa..0ab945311 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -475,6 +475,13 @@ PROTOTYPE( (OM_uint32 *,		/* minor_status */
 	    gss_OID *			/* oid */
 	   ));
 
+
+OM_uint32 krb5_gss_internal_release_oid
+PROTOTYPE( (krb5_context,
+	    OM_uint32 *,		/* minor_status */
+	    gss_OID *			/* oid */
+	   ));
+
 OM_uint32 krb5_gss_inquire_names_for_mech
 PROTOTYPE( (void *,
 	    OM_uint32 *,		/* minor_status */
diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c
index e56467507..444870efe 100644
--- a/src/lib/gssapi/krb5/inq_cred.c
+++ b/src/lib/gssapi/krb5/inq_cred.c
@@ -89,7 +89,7 @@ krb5_gss_inquire_cred(context, minor_status, cred_handle, name, lifetime_ret,
 
    if (name) {
       if (! kg_save_name((gss_name_t) ret_name)) {
-	 (void) generic_gss_release_oid_set(minor_status, &mechs);
+	 (void) gss_release_oid_set(minor_status, &mechs);
 	 krb5_free_principal(context, ret_name);
 	 *minor_status = (OM_uint32) G_VALIDATE_FAILED;
 	 return(GSS_S_FAILURE);
diff --git a/src/lib/gssapi/krb5/get_mechanism.c b/src/lib/gssapi/krb5/k5mech.c
index 92ee00093..865453582 100644
--- a/src/lib/gssapi/krb5/get_mechanism.c
+++ b/src/lib/gssapi/krb5/k5mech.c
@@ -205,10 +205,17 @@ OM_uint32 krb5_gss_inquire_context
 	    gss_name_t*,      /* acceptor_name */
 	    OM_uint32*,       /* lifetime_rec */
 	    gss_OID*,         /* mech_type */
+	    OM_uint32*,	      /* ctx_flags */
 	    int*,             /* ret_flags */
 	    int*              /* locally_initiated */
 	   );
 
+OM_uint32 krb5_gss_internal_release_oid
+      (void *,                /* context */
+       OM_uint32 *,           /* minor_status */
+       gss_OID *              /* OID */
+      );
+
 OM_uint32 krb5_gss_add_cred
 	   (void *,
 	    OM_uint32 *,		/* minor_status */
@@ -302,6 +309,8 @@ static struct gss_config krb5_mechanism =
 	krb5_gss_import_sec_context,
 	krb5_gss_inquire_cred_by_mech,
 	krb5_gss_inquire_names_for_mech,
+	krb5_gss_inquire_context,
+	krb5_gss_internal_release_oid,	 
 	krb5_pname_to_uid,
 	};
 
diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
deleted file mode 100644
index e59fc395a..000000000
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ /dev/null
@@ -1,682 +0,0 @@
-/*
- * Copyright 1993 by OpenVision Technologies, Inc.
- * 
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OpenVision not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. OpenVision makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- * 
- * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "gssapiP_krb5.h"
-
-OM_uint32 INTERFACE
-gss_accept_sec_context(minor_status, context_handle, verifier_cred_handle,
-		       input_token, input_chan_bindings, src_name, mech_type, 
-		       output_token, ret_flags, time_rec, delegated_cred_handle)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t *context_handle;
-     gss_cred_id_t verifier_cred_handle;
-     gss_buffer_t input_token;
-     gss_channel_bindings_t input_chan_bindings;
-     gss_name_t *src_name;
-     gss_OID *mech_type;
-     gss_buffer_t output_token;
-     OM_uint32 *ret_flags;
-     OM_uint32 *time_rec;
-     gss_cred_id_t *delegated_cred_handle;
-{
-   /* validate the context handle */
-   if (! kg_validate_ctx_id(context_handle)) {
-      *minor_status = (OM_uint32) G_VALIDATE_FAILED;
-      return(GSS_S_NO_CONTEXT);
-   }
-
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-
-   return(krb5_gss_accept_sec_context(kg_context, minor_status,
-				      context_handle,
-				      verifier_cred_handle,
-				      input_token,
-				      input_chan_bindings,
-				      src_name,
-				      mech_type,
-				      output_token,
-				      ret_flags,
-				      time_rec,
-				      delegated_cred_handle));
-}
-
-OM_uint32 INTERFACE
-gss_acquire_cred(minor_status, desired_name, time_req, desired_mechs,
-		 cred_usage, output_cred_handle, actual_mechs, time_rec)
-     OM_uint32 *minor_status;
-     gss_name_t desired_name;
-     OM_uint32 time_req;
-     gss_OID_set desired_mechs;
-     gss_cred_usage_t cred_usage;
-     gss_cred_id_t *output_cred_handle;
-     gss_OID_set *actual_mechs;
-     OM_uint32 *time_rec;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_acquire_cred(kg_context, minor_status,
-				desired_name,
-				time_req,
-				desired_mechs,
-				cred_usage,
-				output_cred_handle,
-				actual_mechs,
-				time_rec));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_add_cred(minor_status, input_cred_handle, desired_name, desired_mech,
-	     cred_usage, initiator_time_req, acceptor_time_req,
-	     output_cred_handle, actual_mechs, initiator_time_rec,
-	     acceptor_time_rec)
-    OM_uint32		*minor_status;
-    gss_cred_id_t	input_cred_handle;
-    gss_name_t		desired_name;
-    gss_OID		desired_mech;
-    gss_cred_usage_t	cred_usage;
-    OM_uint32		initiator_time_req;
-    OM_uint32		acceptor_time_req;
-    gss_cred_id_t	*output_cred_handle;
-    gss_OID_set		*actual_mechs;
-    OM_uint32		*initiator_time_rec;
-    OM_uint32		*acceptor_time_rec;
-{
-   if (!kg_context && kg_get_context())
-       return GSS_S_FAILURE;
-
-    return(krb5_gss_add_cred(kg_context,
-			     minor_status, input_cred_handle, desired_name,
-			     desired_mech, cred_usage, initiator_time_req,
-			     acceptor_time_req, output_cred_handle,
-			     actual_mechs, initiator_time_rec,
-			     acceptor_time_rec));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_add_oid_set_member(minor_status, member_oid, oid_set)
-    OM_uint32	*minor_status;
-    gss_OID	member_oid;
-    gss_OID_set	*oid_set;
-{
-    return(generic_gss_add_oid_set_member(minor_status, member_oid, oid_set));
-}
-
-OM_uint32 INTERFACE
-gss_compare_name(minor_status, name1, name2, name_equal)
-     OM_uint32 *minor_status;
-     gss_name_t name1;
-     gss_name_t name2;
-     int *name_equal;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_compare_name(kg_context, minor_status, name1,
-				name2, name_equal));
-}
-
-OM_uint32 INTERFACE
-gss_context_time(minor_status, context_handle, time_rec)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t context_handle;
-     OM_uint32 *time_rec;
-{
-   krb5_gss_ctx_id_t * ctx;
-
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   /* validate the context handle */
-   if (! kg_validate_ctx_id(context_handle)) {
-      *minor_status = (OM_uint32) G_VALIDATE_FAILED;
-      return(GSS_S_NO_CONTEXT);
-   }
-
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
-
-   return(krb5_gss_context_time(kg_context, minor_status, context_handle,
-				time_rec));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_create_empty_oid_set(minor_status, oid_set)
-    OM_uint32	*minor_status;
-    gss_OID_set	*oid_set;
-{
-    return(generic_gss_create_empty_oid_set(minor_status, oid_set));
-}
-
-OM_uint32 INTERFACE
-gss_delete_sec_context(minor_status, context_handle, output_token)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t *context_handle;
-     gss_buffer_t output_token;
-{
-   krb5_gss_ctx_id_t * ctx;
-
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   /* validate the context handle */
-   if (! kg_validate_ctx_id(context_handle)) {
-      *minor_status = (OM_uint32) G_VALIDATE_FAILED;
-      return(GSS_S_NO_CONTEXT);
-   }
-
-   ctx = (krb5_gss_ctx_id_rec *) *context_handle;
-
-   return(krb5_gss_delete_sec_context(kg_context, minor_status,
-				      context_handle, output_token));
-}
-
-OM_uint32 INTERFACE
-gss_display_name(minor_status, input_name, output_name_buffer, output_name_type)
-     OM_uint32 *minor_status;
-     gss_name_t input_name;
-     gss_buffer_t output_name_buffer;
-     gss_OID *output_name_type;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_display_name(kg_context, minor_status, input_name,
-				output_name_buffer, output_name_type));
-}
-
-OM_uint32 INTERFACE
-gss_display_status(minor_status, status_value, status_type,
-		   mech_type, message_context, status_string)
-     OM_uint32 *minor_status;
-     OM_uint32 status_value;
-     int status_type;
-     gss_OID mech_type;
-     OM_uint32 *message_context;
-     gss_buffer_t status_string;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_display_status(kg_context, minor_status, status_value,
-				  status_type, mech_type, message_context,
-				  status_string));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_export_sec_context(minor_status, context_handle, interprocess_token)
-     OM_uint32		*minor_status;
-     gss_ctx_id_t	*context_handle;
-     gss_buffer_t	interprocess_token;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_export_sec_context(kg_context,
-				      minor_status,
-				      context_handle,
-				      interprocess_token));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_get_mic(minor_status, context_handle, qop_req,
-	    message_buffer, message_token)
-     OM_uint32		*minor_status;
-     gss_ctx_id_t	context_handle;
-     gss_qop_t		qop_req;
-     gss_buffer_t	message_buffer;
-     gss_buffer_t	message_token;
-{
-    if (!kg_context && kg_get_context())
-	return GSS_S_FAILURE;
-    return(krb5_gss_get_mic(kg_context, minor_status, context_handle,
-			    qop_req, message_buffer, message_token));
-}
-
-OM_uint32 INTERFACE
-gss_import_name(minor_status, input_name_buffer, input_name_type, output_name)
-     OM_uint32 *minor_status;
-     gss_buffer_t input_name_buffer;
-     gss_OID input_name_type;
-     gss_name_t *output_name;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_import_name(kg_context, minor_status, input_name_buffer,
-			       input_name_type, output_name));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_import_sec_context(minor_status, interprocess_token, context_handle)
-     OM_uint32		*minor_status;
-     gss_buffer_t	interprocess_token;
-     gss_ctx_id_t	*context_handle;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_import_sec_context(kg_context,
-				      minor_status,
-				      interprocess_token,
-				      context_handle));
-}
-
-OM_uint32 INTERFACE
-gss_indicate_mechs(minor_status, mech_set)
-     OM_uint32 *minor_status;
-     gss_OID_set *mech_set;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_indicate_mechs(kg_context, minor_status, mech_set));
-}
-
-OM_uint32 INTERFACE
-gss_init_sec_context(minor_status, claimant_cred_handle, context_handle,
-		     target_name, mech_type, req_flags, time_req,
-		     input_chan_bindings, input_token, actual_mech_type,
-		     output_token, ret_flags, time_rec)
-     OM_uint32 *minor_status;
-     gss_cred_id_t claimant_cred_handle;
-     gss_ctx_id_t *context_handle;
-     gss_name_t target_name;
-     gss_OID mech_type;
-     OM_uint32 req_flags;
-     OM_uint32 time_req;
-     gss_channel_bindings_t input_chan_bindings;
-     gss_buffer_t input_token;
-     gss_OID *actual_mech_type;
-     gss_buffer_t output_token;
-     OM_uint32 *ret_flags;
-     OM_uint32 *time_rec;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_init_sec_context(kg_context, minor_status,
-				    claimant_cred_handle, context_handle,
-				    target_name, mech_type, req_flags,
-				    time_req, input_chan_bindings, input_token,
-				    actual_mech_type, output_token, ret_flags,
-				    time_rec));
-}
-
-OM_uint32 INTERFACE
-gss_inquire_context(minor_status, context_handle, initiator_name, acceptor_name,
-		    lifetime_rec, mech_type, ret_flags,
-		    locally_initiated, open)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t context_handle;
-     gss_name_t *initiator_name;
-     gss_name_t *acceptor_name;
-     OM_uint32 *lifetime_rec;
-     gss_OID *mech_type;
-     OM_uint32 *ret_flags;
-     int *locally_initiated;
-     int *open;
-{
-   krb5_gss_ctx_id_t * ctx;
-
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   /* validate the context handle */
-   if (! kg_validate_ctx_id(context_handle)) {
-      *minor_status = (OM_uint32) G_VALIDATE_FAILED;
-      return(GSS_S_NO_CONTEXT);
-   }
-
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
-
-   return(krb5_gss_inquire_context(kg_context, minor_status, context_handle,
-				   initiator_name, acceptor_name, lifetime_rec,
-				   mech_type, ret_flags, locally_initiated,
-				   open));
-}
-
-OM_uint32 INTERFACE
-gss_inquire_cred(minor_status, cred_handle, name, lifetime_ret,
-		 cred_usage, mechanisms)
-     OM_uint32 *minor_status;
-     gss_cred_id_t cred_handle;
-     gss_name_t *name;
-     OM_uint32 *lifetime_ret;
-     gss_cred_usage_t *cred_usage;
-     gss_OID_set *mechanisms;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_inquire_cred(kg_context, minor_status, cred_handle,
-				name, lifetime_ret, cred_usage, mechanisms));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_inquire_cred_by_mech(minor_status, cred_handle, mech_type, name,
-			 initiator_lifetime, acceptor_lifetime, cred_usage)
-     OM_uint32		*minor_status;
-     gss_cred_id_t	cred_handle;
-     gss_OID		mech_type;
-     gss_name_t		*name;
-     OM_uint32		*initiator_lifetime;
-     OM_uint32		*acceptor_lifetime;
-     gss_cred_usage_t	*cred_usage;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_inquire_cred_by_mech(kg_context, minor_status, cred_handle,
-					mech_type, name, initiator_lifetime,
-					acceptor_lifetime, cred_usage));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_inquire_names_for_mech(minor_status, mechanism, name_types)
-    OM_uint32	*minor_status;
-    gss_OID	mechanism;
-    gss_OID_set	*name_types;
-{
-    return(krb5_gss_inquire_names_for_mech(kg_context,
-					   minor_status,
-					   mechanism,
-					   name_types));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_oid_to_str(minor_status, oid, oid_str)
-    OM_uint32		*minor_status;
-    gss_OID		oid;
-    gss_buffer_t	oid_str;
-{
-    return(generic_gss_oid_to_str(minor_status, oid, oid_str));
-}
-
-OM_uint32 INTERFACE
-gss_process_context_token(minor_status, context_handle, token_buffer)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t context_handle;
-     gss_buffer_t token_buffer;
-{
-   krb5_gss_ctx_id_t * ctx;
-
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   /* validate the context handle */
-   if (! kg_validate_ctx_id(context_handle)) {
-      *minor_status = (OM_uint32) G_VALIDATE_FAILED;
-      return(GSS_S_NO_CONTEXT);
-   }
-
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
-
-   return(krb5_gss_process_context_token(kg_context, minor_status,
-					 context_handle, token_buffer));
-}
-
-OM_uint32 INTERFACE
-gss_release_cred(minor_status, cred_handle)
-     OM_uint32 *minor_status;
-     gss_cred_id_t *cred_handle;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_release_cred(kg_context, minor_status, cred_handle));
-}
-
-OM_uint32 INTERFACE
-gss_release_name(minor_status, input_name)
-     OM_uint32 *minor_status;
-     gss_name_t *input_name;
-{
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   return(krb5_gss_release_name(kg_context, minor_status, input_name));
-}
-
-OM_uint32 INTERFACE
-gss_release_buffer(minor_status, buffer)
-     OM_uint32 *minor_status;
-     gss_buffer_t buffer;
-{
-   return(generic_gss_release_buffer(minor_status,
-				     buffer));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_release_oid(minor_status, oid)
-     OM_uint32	*minor_status;
-     gss_OID	*oid;
-{
-    return(krb5_gss_release_oid(minor_status, oid));
-}
-
-OM_uint32 INTERFACE
-gss_release_oid_set(minor_status, set)
-     OM_uint32* minor_status;
-     gss_OID_set *set;
-{
-   return(generic_gss_release_oid_set(minor_status, set));
-}
-
-/* V1 only */
-OM_uint32 INTERFACE
-gss_seal(minor_status, context_handle, conf_req_flag, qop_req,
-	 input_message_buffer, conf_state, output_message_buffer)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t context_handle;
-     int conf_req_flag;
-     int qop_req;
-     gss_buffer_t input_message_buffer;
-     int *conf_state;
-     gss_buffer_t output_message_buffer;
-{
-   krb5_gss_ctx_id_t * ctx;
-
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   /* validate the context handle */
-   if (! kg_validate_ctx_id(context_handle)) {
-      *minor_status = (OM_uint32) G_VALIDATE_FAILED;
-      return(GSS_S_NO_CONTEXT);
-   }
-
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
-
-   return(krb5_gss_seal(kg_context, minor_status, context_handle,
-			conf_req_flag, qop_req, input_message_buffer,
-			conf_state, output_message_buffer));
-}
-
-/* V1 only */
-OM_uint32 INTERFACE
-gss_sign(minor_status, context_handle, qop_req, message_buffer, message_token)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t context_handle;
-     int qop_req;
-     gss_buffer_t message_buffer;
-     gss_buffer_t message_token;
-{
-   krb5_gss_ctx_id_t * ctx;
-
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   /* validate the context handle */
-   if (! kg_validate_ctx_id(context_handle)) {
-      *minor_status = (OM_uint32) G_VALIDATE_FAILED;
-      return(GSS_S_NO_CONTEXT);
-   }
-
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
-
-   return(krb5_gss_sign(kg_context, minor_status, context_handle,
-			qop_req, message_buffer, message_token));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_str_to_oid(minor_status, oid_str, oid)
-    OM_uint32		*minor_status;
-    gss_buffer_t	oid_str;
-    gss_OID		*oid;
-{
-    return(generic_gss_str_to_oid(minor_status, oid_str, oid));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_test_oid_set_member(minor_status, member, set, present)
-    OM_uint32	*minor_status;
-    gss_OID	member;
-    gss_OID_set	set;
-    int		*present;
-{
-    return(generic_gss_test_oid_set_member(minor_status, member, set,
-					   present));
-}
-
-/* V1 only */
-OM_uint32 INTERFACE
-gss_unseal(minor_status, context_handle, input_message_buffer,
-	   output_message_buffer, conf_state, qop_state)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t context_handle;
-     gss_buffer_t input_message_buffer;
-     gss_buffer_t output_message_buffer;
-     int *conf_state;
-     int *qop_state;
-{
-   krb5_gss_ctx_id_t * ctx;
-
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   /* validate the context handle */
-   if (! kg_validate_ctx_id(context_handle)) {
-      *minor_status = (OM_uint32) G_VALIDATE_FAILED;
-      return(GSS_S_NO_CONTEXT);
-   }
-
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
-
-   return(krb5_gss_unseal(kg_context, minor_status, context_handle,
-			  input_message_buffer, output_message_buffer,
-			  conf_state, qop_state));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_unwrap(minor_status, context_handle, input_message_buffer, 
-	   output_message_buffer, conf_state, qop_state)
-    OM_uint32		*minor_status;
-    gss_ctx_id_t	context_handle;
-    gss_buffer_t	input_message_buffer;
-    gss_buffer_t	output_message_buffer;
-    int			*conf_state;
-    gss_qop_t		*qop_state;
-{
-    if (!kg_context && kg_get_context())
-	return GSS_S_FAILURE;
-    return(krb5_gss_unwrap(kg_context,
-			   minor_status, context_handle, input_message_buffer,
-			   output_message_buffer, conf_state, qop_state));
-}
-
-/* V1 only */
-OM_uint32 INTERFACE
-gss_verify(minor_status, context_handle, message_buffer,
-	   token_buffer, qop_state)
-     OM_uint32 *minor_status;
-     gss_ctx_id_t context_handle;
-     gss_buffer_t message_buffer;
-     gss_buffer_t token_buffer;
-     int *qop_state;
-{
-   krb5_gss_ctx_id_t * ctx;
-
-   if (!kg_context && kg_get_context())
-	   return GSS_S_FAILURE;
-   
-   /* validate the context handle */
-   if (! kg_validate_ctx_id(context_handle)) {
-      *minor_status = (OM_uint32) G_VALIDATE_FAILED;
-      return(GSS_S_NO_CONTEXT);
-   }
-
-   ctx = (krb5_gss_ctx_id_rec *) context_handle;
-
-   return(krb5_gss_verify(kg_context, minor_status, context_handle,
-			  message_buffer, token_buffer, qop_state));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_verify_mic(minor_status, context_handle,
-	       message_buffer, token_buffer, qop_state)
-     OM_uint32		*minor_status;
-     gss_ctx_id_t	context_handle;
-     gss_buffer_t	message_buffer;
-     gss_buffer_t	token_buffer;
-     gss_qop_t		*qop_state;
-{
-    if (!kg_context && kg_get_context())
-	return GSS_S_FAILURE;
-    return(krb5_gss_verify_mic(kg_context, minor_status, context_handle,
-			       message_buffer, token_buffer, qop_state));
-}
-
-/* V2 */
-OM_uint32 INTERFACE
-gss_wrap(minor_status, context_handle, conf_req_flag, qop_req,
-	 input_message_buffer, conf_state, output_message_buffer)
-    OM_uint32		*minor_status;
-    gss_ctx_id_t	context_handle;
-    int			conf_req_flag;
-    gss_qop_t		qop_req;
-    gss_buffer_t	input_message_buffer;
-    int			*conf_state;
-    gss_buffer_t	output_message_buffer;
-{
-    if (!kg_context && kg_get_context())
-	return GSS_S_FAILURE;
-    return(krb5_gss_wrap(kg_context,
-			 minor_status, context_handle, conf_req_flag, qop_req,
-			 input_message_buffer, conf_state,
-			 output_message_buffer));
-}
-
diff --git a/src/lib/gssapi/krb5/rel_oid.c b/src/lib/gssapi/krb5/rel_oid.c
index c311d2fe1..e9626adcd 100644
--- a/src/lib/gssapi/krb5/rel_oid.c
+++ b/src/lib/gssapi/krb5/rel_oid.c
@@ -41,11 +41,35 @@ krb5_gss_release_oid(minor_status, oid)
      * descriptor.  This allows applications to freely mix their own heap-
      * allocated OID values with OIDs returned by GSS-API.
      */
+    if (krb5_gss_internal_release_oid(NULL, minor_status,
+				           oid) != GSS_S_COMPLETE) {
+	/* Pawn it off on the generic routine */
+	return(generic_gss_release_oid(minor_status, oid));
+    }
+    else {
+	*oid = GSS_C_NO_OID;
+	*minor_status = 0;
+	return(GSS_S_COMPLETE);
+    }
+}
+
+
+OM_uint32
+krb5_gss_internal_release_oid(context, minor_status, oid)
+    krb5_context context;
+    OM_uint32	*minor_status;
+    gss_OID	*oid;
+{
+    /*
+     * This function only knows how to release internal OIDs. It will
+     * return GSS_S_CONTINUE_NEEDED for any OIDs it does not recognize.
+     */
+   
     if ((*oid != gss_mech_krb5) &&
 	(*oid != gss_nt_krb5_name) &&
 	(*oid != gss_nt_krb5_principal)) {
-	/* Pawn it off on the generic routine */
-	return(generic_gss_release_oid(minor_status, oid));
+	/* We don't know about this OID */
+	return(GSS_S_CONTINUE_NEEDED);
     }
     else {
 	*oid = GSS_C_NO_OID;
@@ -53,3 +77,4 @@ krb5_gss_release_oid(minor_status, oid)
 	return(GSS_S_COMPLETE);
     }
 }
+