* 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 0756c785246abac9e1eca3b5a3a55f341b571dc6..77cf0da5eef4dd503f80badedb01a116d93c3678 100644 (file)
--- 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 d4bf18e85595222a1f8636ae0064ba92e2815471..2becac9608bcd2f6d27672a10bcce747f0ed0c63 100644 (file)
--- 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 68c00311541e872e9d5cc4c7307693b978cd0bf7..1fb31b55b00da8e1516b154926c95efc64013f60 100644 (file)
--- 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 */
 };