From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C59E138334 for ; Sat, 20 Apr 2019 23:26:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35EDAE0A53; Sat, 20 Apr 2019 23:20:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15B5BE0A60 for ; Sat, 20 Apr 2019 23:20:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FBEB341C43 for ; Fri, 19 Apr 2019 16:58:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 118AC57E for ; Fri, 19 Apr 2019 16:58:24 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1555693044.5d0708a07f8a348e37009f056a7f215480b95fac.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch X-VCS-Directories: net-misc/openssh/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 5d0708a07f8a348e37009f056a7f215480b95fac X-VCS-Branch: master Date: Fri, 19 Apr 2019 16:58:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 08362fbc-edfa-4035-83bb-d51fa684c68e X-Archives-Hash: e709c627ae398fa1f9e58a22d5785864 commit: 5d0708a07f8a348e37009f056a7f215480b95fac Author: Patrick McLean sony com> AuthorDate: Fri Apr 19 16:57:24 2019 +0000 Commit: Patrick McLean gentoo org> CommitDate: Fri Apr 19 16:57:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d0708a0 net-misc/openssh: GSSAPI var rename in in 8.0_p1 (bug 683832) Closes: https://bugs.gentoo.org/683832 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.63, Repoman-2.3.12 Signed-off-by: Patrick McLean gentoo.org> net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch index a3bd128aa46..04d622191fa 100644 --- a/net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch +++ b/net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch @@ -5,7 +5,7 @@ index 8696f258..f4cd70a3 100644 @@ -723,120 +723,6 @@ fakepw(void) return (&fake); } - + -/* - * Returns the remote DNS hostname as a string. The returned string must not - * be freed. NB. this will usually trigger a DNS query the first time it is @@ -272,7 +272,7 @@ index 71a5c795..2a8c6990 100644 @@ -993,6 +996,10 @@ parse_time: intptr = &options->gss_deleg_creds; goto parse_flag; - + + case oGssTrustDns: + intptr = &options->gss_trust_dns; + goto parse_flag; @@ -342,10 +342,10 @@ index dffee90b..a25a32b9 100644 + + if (options.gss_trust_dns) { + extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns); -+ gss_host = auth_get_canonical_hostname(active_state, 1); ++ gss_host = auth_get_canonical_hostname(ssh, 1); + } else + gss_host = authctxt->host; - + /* Try one GSSAPI method at a time, rather than sending them all at * once. */ @@ -712,7 +719,7 @@ userauth_gssapi(struct ssh *ssh)