pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / lib / gssapi / mechglue / mglueP.h

diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index f21929015d2975b45b1822738107e7f9c4193af8..3524ceae4840e2d77453d14bc677a4801023bf99 100644 (file)
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -396,7 +396,7 @@ typedef struct gss_config {
        OM_uint32       (*gssspi_set_cred_option)
        (
                    OM_uint32 *,        /* minor_status */
-                   gss_cred_id_t,      /* cred_handle */
+                   gss_cred_id_t *,    /* cred_handle */
                    const gss_OID,      /* OID */
                    const gss_buffer_t  /* value */
                    );
@@ -588,6 +588,31 @@ typedef struct gss_config {
            gss_cred_id_t,              /* cred_handle */
            const gss_OID_set           /* mech_set */
        /* */);
+
+       OM_uint32       (*gss_inquire_saslname_for_mech)
+       (
+           OM_uint32 *,                /* minor_status */
+           const gss_OID,              /* desired_mech */
+           gss_buffer_t,               /* sasl_mech_name */
+           gss_buffer_t,               /* mech_name */
+           gss_buffer_t                /* mech_description */
+       /* */);
+
+       OM_uint32       (*gss_inquire_mech_for_saslname)
+       (
+           OM_uint32 *,                /* minor_status */
+           const gss_buffer_t,         /* sasl_mech_name */
+           gss_OID *                   /* mech_type */
+       /* */);
+
+       OM_uint32       (*gss_inquire_attrs_for_mech)
+       (
+           OM_uint32 *,                /* minor_status */
+           gss_const_OID,              /* mech */
+           gss_OID_set *,              /* mech_attrs */
+           gss_OID_set *               /* known_mech_attrs */
+       /* */);
+
 } *gss_mechanism;
 
 /* This structure MUST NOT be used by any code outside libgss */
@@ -702,18 +727,6 @@ gssint_userok(
        int *                   /* user_ok */
 );
 
-OM_uint32
-gss_store_cred(
-       OM_uint32 *,            /* minor_status */
-       const gss_cred_id_t,    /* input_cred_handle */
-       gss_cred_usage_t,       /* cred_usage */
-       const gss_OID,          /* desired_mech */
-       OM_uint32,              /* overwrite_cred */
-       OM_uint32,              /* default_cred */
-       gss_OID_set *,          /* elements_stored */
-       gss_cred_usage_t *      /* cred_usage_stored */
-);
-
 int
 gssint_get_der_length(
        unsigned char **,       /* buf */