Date: Tue, 11 Nov 2008 14:45:27 +0000 (UTC) From: Doug Rabson <dfr@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r184848 - user/dfr/gssapi/6/sys/kgssapi/krb5 Message-ID: <200811111445.mABEjRio004350@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dfr Date: Tue Nov 11 14:45:27 2008 New Revision: 184848 URL: http://svn.freebsd.org/changeset/base/184848 Log: FreeBSD 6.x doesn't have the mechanism oid at the start of the context token. Modified: user/dfr/gssapi/6/sys/kgssapi/krb5/krb5_mech.c Modified: user/dfr/gssapi/6/sys/kgssapi/krb5/krb5_mech.c ============================================================================== --- user/dfr/gssapi/6/sys/kgssapi/krb5/krb5_mech.c Tue Nov 11 14:44:47 2008 (r184847) +++ user/dfr/gssapi/6/sys/kgssapi/krb5/krb5_mech.c Tue Nov 11 14:45:27 2008 (r184848) @@ -422,8 +422,11 @@ krb5_import(struct krb5_context *kc, #define SC_LOCAL_SUBKEY 8 #define SC_REMOTE_SUBKEY 16 +#if __FreeBSD_version >= 700000 /* - * Ensure that the token starts with krb5 oid. + * Ensure that the token starts with krb5 oid. FreeBSD 6.x + * doesn't have the libgssapi plugin layer that adds this + * framing. */ if (p[0] != 0x00 || p[1] != krb5_mech_oid.length || len < krb5_mech_oid.length + 2 @@ -432,6 +435,7 @@ krb5_import(struct krb5_context *kc, return (GSS_S_DEFECTIVE_TOKEN); p += krb5_mech_oid.length + 2; len -= krb5_mech_oid.length + 2; +#endif flags = get_uint32(&p, &len); kc->kc_ac_flags = get_uint32(&p, &len);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811111445.mABEjRio004350>