summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-08-06 16:58:15 +0800
committerMike Frysinger <vapier@gentoo.org>2016-08-06 16:58:31 +0800
commite6076963fcabaed3aff9b469a20f54d3063ce575 (patch)
tree0b5930baf5acdae9236a8b9567d6f3007d5c55b9 /net-misc/openssh
parentx11-misc/xac: Cleanup per bug #64843 (diff)
downloadgentoo-e6076963fcabaed3aff9b469a20f54d3063ce575.tar.gz
gentoo-e6076963fcabaed3aff9b469a20f54d3063ce575.tar.bz2
gentoo-e6076963fcabaed3aff9b469a20f54d3063ce575.zip
net-misc/openssh: fix implicit prototype warning w/USE=kerberos #590382
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch7
1 files changed, 4 insertions, 3 deletions
diff --git a/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch
index d6798e2a8615..806b36d0ca94 100644
--- a/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch
+++ b/net-misc/openssh/files/openssh-7.3_p1-GSSAPI-dns.patch
@@ -82,15 +82,16 @@ https://bugzilla.mindrot.org/show_bug.cgi?id=1008
.Xr ssh 1
--- a/sshconnect2.c
+++ b/sshconnect2.c
-@@ -656,6 +656,12 @@
+@@ -656,6 +656,13 @@
static u_int mech = 0;
OM_uint32 min;
int ok = 0;
+ const char *gss_host;
+
-+ if (options.gss_trust_dns)
++ 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);
-+ else
++ } else
+ gss_host = authctxt->host;
/* Try one GSSAPI method at a time, rather than sending them all at