summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <patrick.mclean@sony.com>2019-04-19 09:57:24 -0700
committerPatrick McLean <chutzpah@gentoo.org>2019-04-19 09:57:24 -0700
commit5d0708a07f8a348e37009f056a7f215480b95fac (patch)
tree60b45c19cb4e66defcd2b0f036fff78c24eb01b4 /net-misc/openssh
parentpackage.mask: Unmask Perl 5.28.2 (diff)
downloadgentoo-5d0708a07f8a348e37009f056a7f215480b95fac.tar.gz
gentoo-5d0708a07f8a348e37009f056a7f215480b95fac.tar.bz2
gentoo-5d0708a07f8a348e37009f056a7f215480b95fac.zip
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 <chutzpah@gentoo.org>
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch8
1 files 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)