From: Tom Yu Date: Fri, 31 Aug 2007 20:54:58 +0000 (+0000) Subject: pull up r19828 from trunk X-Git-Tag: krb5-1.6.3-beta1~30 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a6dee82c4d7f3e606fe4a11cdea87ad1f6844628;p=krb5.git pull up r19828 from trunk 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 --- diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c index 0db0b5f92..427bdee56 100644 --- a/src/lib/gssapi/spnego/spnego_mech.c +++ b/src/lib/gssapi/spnego/spnego_mech.c @@ -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 *,