| 1 |
commit: 5d0708a07f8a348e37009f056a7f215480b95fac |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Fri Apr 19 16:57:24 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 19 16:57:24 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d0708a0 |
| 7 |
|
| 8 |
net-misc/openssh: GSSAPI var rename in in 8.0_p1 (bug 683832) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/683832 |
| 11 |
Copyright: Sony Interactive Entertainment Inc. |
| 12 |
Package-Manager: Portage-2.3.63, Repoman-2.3.12 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch | 8 ++++---- |
| 16 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index a3bd128aa46..04d622191fa 100644 |
| 20 |
--- a/net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch |
| 21 |
+++ b/net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch |
| 22 |
@@ -5,7 +5,7 @@ index 8696f258..f4cd70a3 100644 |
| 23 |
@@ -723,120 +723,6 @@ fakepw(void) |
| 24 |
return (&fake); |
| 25 |
} |
| 26 |
- |
| 27 |
+ |
| 28 |
-/* |
| 29 |
- * Returns the remote DNS hostname as a string. The returned string must not |
| 30 |
- * be freed. NB. this will usually trigger a DNS query the first time it is |
| 31 |
@@ -272,7 +272,7 @@ index 71a5c795..2a8c6990 100644 |
| 32 |
@@ -993,6 +996,10 @@ parse_time: |
| 33 |
intptr = &options->gss_deleg_creds; |
| 34 |
goto parse_flag; |
| 35 |
- |
| 36 |
+ |
| 37 |
+ case oGssTrustDns: |
| 38 |
+ intptr = &options->gss_trust_dns; |
| 39 |
+ goto parse_flag; |
| 40 |
@@ -342,10 +342,10 @@ index dffee90b..a25a32b9 100644 |
| 41 |
+ |
| 42 |
+ if (options.gss_trust_dns) { |
| 43 |
+ extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns); |
| 44 |
-+ gss_host = auth_get_canonical_hostname(active_state, 1); |
| 45 |
++ gss_host = auth_get_canonical_hostname(ssh, 1); |
| 46 |
+ } else |
| 47 |
+ gss_host = authctxt->host; |
| 48 |
- |
| 49 |
+ |
| 50 |
/* Try one GSSAPI method at a time, rather than sending them all at |
| 51 |
* once. */ |
| 52 |
@@ -712,7 +719,7 @@ userauth_gssapi(struct ssh *ssh) |
Archives