From owner-svn-src-all@freebsd.org  Wed Jul 12 15:16:02 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD19FD99ECB;
 Wed, 12 Jul 2017 15:16:02 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9E422661A1;
 Wed, 12 Jul 2017 15:16:02 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6CFG1Ku034303;
 Wed, 12 Jul 2017 15:16:01 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6CFG14N034302;
 Wed, 12 Jul 2017 15:16:01 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201707121516.v6CFG14N034302@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 12 Jul 2017 15:16:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r320915 - releng/10.3/crypto/heimdal/lib/krb5
X-SVN-Group: releng
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: releng/10.3/crypto/heimdal/lib/krb5
X-SVN-Commit-Revision: 320915
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Jul 2017 15:16:03 -0000

Author: delphij
Date: Wed Jul 12 15:16:01 2017
New Revision: 320915
URL: https://svnweb.freebsd.org/changeset/base/320915

Log:
  Add the missed Heimdal patch, freebsd-update bits are not affected.
  
  Noticed by:	gordon
  Approved by:	so

Modified:
  releng/10.3/crypto/heimdal/lib/krb5/ticket.c

Modified: releng/10.3/crypto/heimdal/lib/krb5/ticket.c
==============================================================================
--- releng/10.3/crypto/heimdal/lib/krb5/ticket.c	Wed Jul 12 14:51:32 2017	(r320914)
+++ releng/10.3/crypto/heimdal/lib/krb5/ticket.c	Wed Jul 12 15:16:01 2017	(r320915)
@@ -713,8 +713,8 @@ _krb5_extract_ticket(krb5_context context,
     /* check server referral and save principal */
     ret = _krb5_principalname2krb5_principal (context,
 					      &tmp_principal,
-					      rep->kdc_rep.ticket.sname,
-					      rep->kdc_rep.ticket.realm);
+					      rep->enc_part.sname,
+					      rep->enc_part.srealm);
     if (ret)
 	goto out;
     if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){