Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,15 +1,15 @@
$NetBSD: patch-ssh.c,v 1.4 2015/07/09 16:14:23 taca Exp $
$NetBSD: patch-ssh.c,v 1.6 2016/03/15 20:54:07 bsiegert Exp $
Interix support
--- ssh.c.orig 2015-07-01 02:35:31.000000000 +0000
--- ssh.c.orig 2016-03-09 18:04:48.000000000 +0000
+++ ssh.c
@@ -1083,7 +1083,7 @@ main(int ac, char **av)
"disabling");
options.update_hostkeys = 0;
@@ -1097,7 +1097,7 @@ main(int ac, char **av)
}
if (options.connection_attempts <= 0)
fatal("Invalid number of ConnectionAttempts");
-#ifndef HAVE_CYGWIN
+#if defined(HAVE_CYGWIN) || defined(HAVE_INTERIX)
+#if !defined(HAVE_CYGWIN) && !defined(HAVE_INTERIX)
if (original_effective_uid != 0)
options.use_privileged_port = 0;
#endif