3 files changed, 16 insertions, 14 deletions

diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index 8936b63f05..ca19b18910 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -170,12 +170,13 @@ int g_make_string_buffer (const char *str, gss_buffer_t buffer);
 
 int g_copy_OID_set (const gss_OID_set_desc * const in, gss_OID_set *out);
 
-unsigned int g_token_size (gss_OID mech, unsigned int body_size);
+unsigned int g_token_size (const gss_OID_desc * mech, unsigned int body_size);
 
-void g_make_token_header (gss_OID mech, unsigned int body_size,
+void g_make_token_header (const gss_OID_desc * mech, unsigned int body_size,
 			  unsigned char **buf, int tok_type);
 
-gss_int32 g_verify_token_header (gss_OID mech, unsigned int *body_size,
+gss_int32 g_verify_token_header (const gss_OID_desc * mech, 
+				 unsigned int *body_size,
 				 unsigned char **buf, int tok_type, 
 				 unsigned int toksize_in,
 				 int wrapper_required);
@@ -223,7 +224,7 @@ OM_uint32 generic_gss_release_oid
 
 OM_uint32 generic_gss_copy_oid
 (OM_uint32 *,	/* minor_status */
-	    gss_OID,		/* oid */
+	    const gss_OID_desc * const,		/* oid */
 	    gss_OID *		/* new_oid */
 	    );
 
@@ -234,20 +235,20 @@ OM_uint32 generic_gss_create_empty_oid_set
 
 OM_uint32 generic_gss_add_oid_set_member
 (OM_uint32 *,	/* minor_status */
-	    gss_OID,		/* member_oid */
+	    const gss_OID_desc * const,		/* member_oid */
 	    gss_OID_set *	/* oid_set */
 	   );
 
 OM_uint32 generic_gss_test_oid_set_member
 (OM_uint32 *,	/* minor_status */
-	    gss_OID,		/* member */
+	    const gss_OID_desc * const,		/* member */
 	    gss_OID_set,	/* set */
 	    int *		/* present */
 	   );
 
 OM_uint32 generic_gss_oid_to_str
 (OM_uint32 *,	/* minor_status */
-	    gss_OID,		/* oid */
+	    const gss_OID_desc * const,		/* oid */
 	    gss_buffer_t	/* oid_str */
 	   );
 
diff --git a/src/lib/gssapi/generic/oid_ops.c b/src/lib/gssapi/generic/oid_ops.c
index a73589879d..1234f2ee70 100644
--- a/src/lib/gssapi/generic/oid_ops.c
+++ b/src/lib/gssapi/generic/oid_ops.c
@@ -75,7 +75,8 @@ generic_gss_release_oid(minor_status, oid)
 OM_uint32
 generic_gss_copy_oid(minor_status, oid, new_oid)
 	OM_uint32	*minor_status;
-	gss_OID		oid, *new_oid;
+	const gss_OID_desc * const oid;
+	gss_OID         *new_oid;
 {
 	gss_OID		p;
 
@@ -116,7 +117,7 @@ generic_gss_create_empty_oid_set(minor_status, oid_set)
 OM_uint32
 generic_gss_add_oid_set_member(minor_status, member_oid, oid_set)
     OM_uint32	*minor_status;
-    gss_OID	member_oid;
+    const gss_OID_desc * const	member_oid;
     gss_OID_set	*oid_set;
 {
     gss_OID	elist;
@@ -161,7 +162,7 @@ generic_gss_add_oid_set_member(minor_status, member_oid, oid_set)
 OM_uint32
 generic_gss_test_oid_set_member(minor_status, member, set, present)
     OM_uint32	*minor_status;
-    gss_OID	member;
+    const gss_OID_desc * const	member;
     gss_OID_set	set;
     int		*present;
 {
@@ -189,7 +190,7 @@ generic_gss_test_oid_set_member(minor_status, member, set, present)
 OM_uint32
 generic_gss_oid_to_str(minor_status, oid, oid_str)
     OM_uint32		*minor_status;
-    gss_OID		oid;
+    const gss_OID_desc * const	oid;
     gss_buffer_t	oid_str;
 {
     char		numstr[128];
diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c
index 6277e942a2..7b8dfed223 100644
--- a/src/lib/gssapi/generic/util_token.c
+++ b/src/lib/gssapi/generic/util_token.c
@@ -133,7 +133,7 @@ static int der_read_length(buf, bufsize)
 /* returns the length of a token, given the mech oid and the body size */
 
 unsigned int g_token_size(mech, body_size)
-     gss_OID mech;
+     const gss_OID_desc * mech;
      unsigned int body_size;
 {
    /* set body_size to sequence contents size */
@@ -145,7 +145,7 @@ unsigned int g_token_size(mech, body_size)
    be the right size.  buf is advanced past the token header */
 
 void g_make_token_header(mech, body_size, buf, tok_type)
-     gss_OID mech;
+     const gss_OID_desc * mech;
      unsigned int body_size;
      unsigned char **buf;
      int tok_type;
@@ -172,7 +172,7 @@ void g_make_token_header(mech, body_size, buf, tok_type)
 
 gss_int32 g_verify_token_header(mech, body_size, buf_in, tok_type, toksize_in,
 				wrapper_required)
-     gss_OID mech;
+     const gss_OID_desc * mech;
      unsigned int *body_size;
      unsigned char **buf_in;
      int tok_type;