pull up r19828 from trunk
authorTom Yu <tlyu@mit.edu>
Fri, 31 Aug 2007 20:54:58 +0000 (20:54 +0000)
committerTom Yu <tlyu@mit.edu>
Fri, 31 Aug 2007 20:54:58 +0000 (20:54 +0000)
 r19828@cathode-dark-space:  epeisach | 2007-08-15 21:52:10 -0400
 ticket: 5581
 tags: pullup

 Change prototype for g_token_size to match function declaration later
 in file. (OM_Uint32 changed to unsigned int). On a 64 bit architecture, they
 are different.

ticket: 5581
version_fixed: 1.6.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19901 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/gssapi/spnego/spnego_mech.c

index 0db0b5f92b372c8c1c2ef0c75240c66e42223691..427bdee56a14ebc1c1fb7b2289d8d24ae77d0657 100644 (file)
@@ -61,7 +61,7 @@ extern int gssint_put_der_length(OM_uint32, unsigned char **, OM_uint32);
 /* private routines for spnego_mechanism */
 static spnego_token_t make_spnego_token(char *);
 static gss_buffer_desc make_err_msg(char *);
-static int g_token_size(gss_OID_const, OM_uint32);
+static int g_token_size(gss_OID_const, unsigned int);
 static int g_make_token_header(gss_OID_const, unsigned int,
                               unsigned char **, unsigned int);
 static int g_verify_token_header(gss_OID_const, unsigned int *,