Import of pkgsrc-2015Q3

security/openssh/patches/patch-ssh.c

@@ -1,13 +1,13 @@
-$NetBSD: patch-ssh.c,v 1.3 2014/03/29 09:38:11 taca Exp $
+$NetBSD: patch-ssh.c,v 1.4 2015/07/09 16:14:23 taca Exp $
 
 Interix support
 
---- ssh.c.orig	2014-02-26 23:17:13.000000000 +0000
+--- ssh.c.orig	2015-07-01 02:35:31.000000000 +0000
 +++ ssh.c
-@@ -943,7 +943,7 @@ main(int ac, char **av)
- 	    strcmp(options.proxy_command, "-") == 0 &&
- 	    options.proxy_use_fdpass)
- 		fatal("ProxyCommand=- and ProxyUseFDPass are incompatible");
+@@ -1083,7 +1083,7 @@ main(int ac, char **av)
+ 		    "disabling");
+ 		options.update_hostkeys = 0;
+ 	}
 -#ifndef HAVE_CYGWIN
 +#if defined(HAVE_CYGWIN) || defined(HAVE_INTERIX)
  	if (original_effective_uid != 0)