From owner-svn-src-user@FreeBSD.ORG  Tue Nov 11 14:45:27 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E45181065688;
	Tue, 11 Nov 2008 14:45:27 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CD3768FC14;
	Tue, 11 Nov 2008 14:45:27 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mABEjR2g004351;
	Tue, 11 Nov 2008 14:45:27 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mABEjRio004350;
	Tue, 11 Nov 2008 14:45:27 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200811111445.mABEjRio004350@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Tue, 11 Nov 2008 14:45:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184848 - user/dfr/gssapi/6/sys/kgssapi/krb5
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Nov 2008 14:45:28 -0000

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);