--- /net/etna.eng/build7/semery/mit2/webrev/usr/src/uts/common/gssapi/include/mechglueP.h-      Wed Sep  8 17:01:20 2004
+++ mechglueP.h Wed Sep  8 13:42:10 2004
@@ -8,11 +8,11 @@
  */
 
 #ifndef        _MECHGLUEP_H
 #define        _MECHGLUEP_H
 
-#pragma ident  "@(#)mechglueP.h        1.42    04/09/08 SMI"
+#pragma ident  "@(#)mechglueP.h        1.41    04/04/06 SMI"
 
 #include <sys/types.h>
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_ext.h>
 
@@ -359,10 +359,18 @@
                    void *,             /* context */
                    OM_uint32 *,        /* minor_status */
                    const gss_name_t,   /* pname */
                    uid_t *             /* uid */
        /* */);
+       OM_uint32               (*__gss_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 */
                OM_uint32 *,            /* minor_status */
                const gss_name_t,       /* input_name */
@@ -437,10 +445,24 @@
                int *                   /* qop_state */
 #ifdef  _KERNEL
        /* */, OM_uint32
 #endif
        /* */);
+#ifndef         _KERNEL
+       OM_uint32       (*gss_store_cred)
+       (
+               void *,                 /* context */
+               OM_uint32 *,            /* minor_status */
+               const gss_cred_id_t,    /* input_cred */
+               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 */
+       /* */);
+#endif
 } *gss_mechanism;
 
 /*
  * In the user space we use a wrapper structure to encompass the
  * mechanism entry points.  The wrapper contain the mechanism
@@ -451,10 +473,11 @@
 #ifndef _KERNEL
 typedef struct gss_mech_config {
        char * kmodName;                /* kernel module name */
        char * uLibName;                /* user library name */
        char * mechNameStr;             /* mechanism string name */
+       char *optionStr;                /* optional mech parameters */
        gss_OID mech_type;              /* mechanism oid */
        gss_mechanism mech;             /* mechanism initialization struct */
        struct gss_mech_config *next;   /* next element in the list */
 } *gss_mech_info;
 #endif
@@ -464,10 +487,11 @@
  * Internal mechglue routines
  */
 
 gss_mechanism __gss_get_mechanism(const gss_OID);
 char * __gss_get_kmodName(const gss_OID);
+char *__gss_get_modOptions(const gss_OID);
 OM_uint32 __gss_import_internal_name(OM_uint32 *, const gss_OID,
        gss_union_name_t, gss_name_t *);
 OM_uint32 __gss_export_internal_name(OM_uint32 *, const gss_OID,
        const gss_name_t, gss_buffer_t);
 OM_uint32 __gss_display_internal_name(OM_uint32 *, const gss_OID,