From owner-svn-ports-all@freebsd.org Tue Jan 30 02:20:11 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E8039ECD69E; Tue, 30 Jan 2018 02:20:10 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9672D74C0F; Tue, 30 Jan 2018 02:20:10 +0000 (UTC) (envelope-from dvl@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 915B610DFF; Tue, 30 Jan 2018 02:20:10 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0U2KAAo041952; Tue, 30 Jan 2018 02:20:10 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0U2KA3t041949; Tue, 30 Jan 2018 02:20:10 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201801300220.w0U2KA3t041949@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Tue, 30 Jan 2018 02:20:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460369 - in head/security/py-kerberos: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: in head/security/py-kerberos: . files X-SVN-Commit-Revision: 460369 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jan 2018 02:20:11 -0000 Author: dvl Date: Tue Jan 30 02:20:10 2018 New Revision: 460369 URL: https://svnweb.freebsd.org/changeset/ports/460369 Log: Fix for use with either GSSAPI_BASE or GSSAPI_HEIMDAL Without, the first invocation of authGSSClientStep raises kerberos.GSSError after failing to acquire a ticket for the krbtgt service on the intended host rather than the specified service. PR: 204899 Submitted by: John W. O'Brien Modified: head/security/py-kerberos/Makefile head/security/py-kerberos/files/extra-patch-src_kerberosgss.c head/security/py-kerberos/files/extra-patch-src_kerberosgss.h Modified: head/security/py-kerberos/Makefile ============================================================================== --- head/security/py-kerberos/Makefile Tue Jan 30 01:18:07 2018 (r460368) +++ head/security/py-kerberos/Makefile Tue Jan 30 02:20:10 2018 (r460369) @@ -3,6 +3,7 @@ PORTNAME= kerberos PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/security/py-kerberos/files/extra-patch-src_kerberosgss.c ============================================================================== --- head/security/py-kerberos/files/extra-patch-src_kerberosgss.c Tue Jan 30 01:18:07 2018 (r460368) +++ head/security/py-kerberos/files/extra-patch-src_kerberosgss.c Tue Jan 30 02:20:10 2018 (r460369) @@ -38,3 +38,12 @@ if (kt) { krb5_kt_close(kcontext, kt); } +@@ -150,7 +148,7 @@ int authenticate_gss_client_init( + name_token.value = (char *)service; + + maj_stat = gss_import_name( +- &min_stat, &name_token, gss_krb5_nt_service_name, &state->server_name ++ &min_stat, &name_token, GSS_C_NT_HOSTBASED_SERVICE, &state->server_name + ); + + if (GSS_ERROR(maj_stat)) { Modified: head/security/py-kerberos/files/extra-patch-src_kerberosgss.h ============================================================================== --- head/security/py-kerberos/files/extra-patch-src_kerberosgss.h Tue Jan 30 01:18:07 2018 (r460368) +++ head/security/py-kerberos/files/extra-patch-src_kerberosgss.h Tue Jan 30 02:20:10 2018 (r460369) @@ -1,11 +1,10 @@ --- src/kerberosgss.h.orig 2015-03-29 03:41:32 UTC +++ src/kerberosgss.h -@@ -14,8 +14,9 @@ +@@ -14,8 +14,8 @@ * limitations under the License. **/ +#include -+#define gss_krb5_nt_service_name GSS_KRB5_NT_PRINCIPAL_NAME #include -#include #include