diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2011-10-21 16:18:56 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2011-10-21 16:18:56 +0000 |
| commit | 9b3fe7c2f48a356eaf0e7273e66023d4ae597cfd (patch) | |
| tree | 36a2e3b758da540f13f821ec14f92b80c0adb4ca /security/openssh-portable/files/patch-ssh.c | |
| parent | Fix build with gcc 4.6 (diff) | |
- update to 5.8p2 [1]
- fix Kerberos knob [2]
- fix build on 9.0 [3]
- fix deinstall with various knobs [4]
- fix LPK knob [5]
PR: ports/161818 [1], ports/144597 [2], ports/160389 [3]
ports/150493, ports/156926 [4], ports/155456 [5]
Submitted by: "Grzegorz Blach" <magik@roorback.net> [1], [2], [4], [5]
pluknet [3]
Reported by: Jonathan <lordsith49@hotmail.com> [2]
Kevin Thompson <antiduh@csh.rit.edu> [4]
Alexey Remizov <alexey@remizov.org> [5]
Notes
Notes:
svn path=/head/; revision=284070
Diffstat (limited to 'security/openssh-portable/files/patch-ssh.c')
| -rw-r--r-- | security/openssh-portable/files/patch-ssh.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/security/openssh-portable/files/patch-ssh.c b/security/openssh-portable/files/patch-ssh.c index ba7ddd3b6aa0..bc95ec9c7ca6 100644 --- a/security/openssh-portable/files/patch-ssh.c +++ b/security/openssh-portable/files/patch-ssh.c @@ -1,10 +1,13 @@ ---- ssh.c.orig Sat Sep 2 02:32:40 2006 -+++ ssh.c Sat Sep 30 10:38:05 2006 -@@ -639,6 +640,23 @@ +$FreeBSD$ + +Make the same change to use the canonical hostname as the base FreeBSD ssh. + +--- ssh.c.orig 2010-08-16 09:59:31.000000000 -0600 ++++ ssh.c 2010-08-25 17:55:01.000000000 -0600 +@@ -699,6 +699,23 @@ + "h", host, (char *)NULL); + } - if (options.hostname != NULL) - host = options.hostname; -+ + /* Find canonic host name. */ + if (strchr(host, '.') == 0) { + struct addrinfo hints; @@ -21,6 +24,7 @@ + freeaddrinfo(ai); + } + } ++ + if (options.local_command != NULL) { + char thishost[NI_MAXHOST]; - /* force lowercase for hostkey matching */ - if (options.host_key_alias != NULL) { |