From: Tom Yu <tlyu@mit.edu>
Date: Thu, 29 Jun 2006 04:38:48 +0000 (+0000)
Subject: 	* src/lib/gssapi/mechglue/mglueP.h (struct gss_config): Remove
X-Git-Tag: krb5-1.6-alpha1~244
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=05efc302e804e014a51054598bd49fe6a3c8556a;p=krb5.git

	* src/lib/gssapi/mechglue/mglueP.h (struct gss_config): Remove
	gssint_userok and pname_to_uid, as we don't implement things which
	use them.

	* src/lib/gssapi/krb5/krb5_gss_glue.c (KRB5_GSS_CONFIG_INIT):
	* src/lib/gssapi/spnego/spnego_mech.c (spnego_mechanism): Update
	for struct gss_config changes.

ticket: 3954
tags: pullup
target_version: 1.5
version_reported: 1.5
component: krb5-libs

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

diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index 0756c7852..77cf0da5e 100644
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -366,8 +366,6 @@ static OM_uint32 k5glue_validate_cred
     k5glue_inquire_context,				\
     k5glue_internal_release_oid,			\
     k5glue_wrap_size_limit,				\
-    NULL,			/* pname_to_uid */	\
-    NULL,			/* userok */		\
     k5glue_export_name,					\
     NULL			/* store_cred */
 
diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index d4bf18e85..2becac960 100644
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -339,22 +339,6 @@ typedef struct gss_config {
 		    OM_uint32,		/* req_output_size */
 		    OM_uint32 *		/* max_input_size */
 	 );
-    int		     (*pname_to_uid)
-	(
-		    void *,		/* context */
-		    char *,		/* pname */
-		    gss_OID,		/* name type */
-		    gss_OID,		/* mech type */
-		    uid_t *		/* uid */
-		    );
-	OM_uint32		(*gssint_userok)
-	(
-		    void *,		/* context */
-		    OM_uint32 *,	/* minor_status */
-		    const gss_name_t,	/* pname */
-		    const char *,	/* local user */
-		    int *		/* user ok? */
-	/* */);
 	OM_uint32		(*gss_export_name)
 	(
 		void *,			/* context */
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 68c003115..1fb31b55b 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -187,8 +187,6 @@ static struct gss_config spnego_mechanism =
 	spnego_gss_inquire_context,	/* gss_inquire_context */
 	NULL,				/* gss_internal_release_oid */
 	spnego_gss_wrap_size_limit,	/* gss_wrap_size_limit */
-	NULL,				/* gss_pname_to_uid */
-	NULL,				/* gssint_userok */
 	NULL,				/* gss_export_name */
 	NULL,				/* gss_store_cred */
 };