From owner-svn-src-stable-11@freebsd.org  Sun Mar 12 13:22:36 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 77290D0938F;
 Sun, 12 Mar 2017 13:22:36 +0000 (UTC) (envelope-from des@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 3C74D10C5;
 Sun, 12 Mar 2017 13:22:36 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2CDMZ5U061821;
 Sun, 12 Mar 2017 13:22:35 GMT (envelope-from des@FreeBSD.org)
Received: (from des@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2CDMZlT061820;
 Sun, 12 Mar 2017 13:22:35 GMT (envelope-from des@FreeBSD.org)
Message-Id: <201703121322.v2CDMZlT061820@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org
 using -f
From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org>
Date: Sun, 12 Mar 2017 13:22:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r315151 - stable/11/lib/libpam/modules/pam_krb5
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Mar 2017 13:22:36 -0000

Author: des
Date: Sun Mar 12 13:22:35 2017
New Revision: 315151
URL: https://svnweb.freebsd.org/changeset/base/315151

Log:
  MFH (r314598): load default options before requesting ticket
  
  PR:		213909

Modified:
  stable/11/lib/libpam/modules/pam_krb5/pam_krb5.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libpam/modules/pam_krb5/pam_krb5.c
==============================================================================
--- stable/11/lib/libpam/modules/pam_krb5/pam_krb5.c	Sun Mar 12 13:20:07 2017	(r315150)
+++ stable/11/lib/libpam/modules/pam_krb5/pam_krb5.c	Sun Mar 12 13:22:35 2017	(r315151)
@@ -239,6 +239,8 @@ pam_sm_authenticate(pam_handle_t *pamh, 
 		retval = PAM_SERVICE_ERR;
 		goto cleanup2;
 	}
+	krb5_get_init_creds_opt_set_default_flags(pam_context,
+	    service, NULL, opts);
 
 	if (openpam_get_option(pamh, PAM_OPT_FORWARDABLE))
 		krb5_get_init_creds_opt_set_forwardable(opts, 1);