From 549d532c090d17824ce19a5e39b9979b0c534837 Mon Sep 17 00:00:00 2001
From: Manoj Ampalam <manojamp@microsoft.com>
Date: Thu, 16 Nov 2017 14:08:23 -0800
Subject: [PATCH] Ported upstream changes

---
 contrib/win32/openssh/config.h.vs                    | 2 +-
 contrib/win32/openssh/openbsd_compat.vcxproj         | 4 ++--
 contrib/win32/openssh/openbsd_compat.vcxproj.filters | 4 ++--
 sftp.c                                               | 6 ++++--
 ssh.c                                                | 2 ++
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/contrib/win32/openssh/config.h.vs b/contrib/win32/openssh/config.h.vs
index 69bdc8773..3e552848a 100644
--- a/contrib/win32/openssh/config.h.vs
+++ b/contrib/win32/openssh/config.h.vs
@@ -435,7 +435,7 @@
 /* #undef HAVE_GETOPT_OPTRESET */
 
 /* Define if your libraries define getpagesize() */
-#define HAVE_GETPAGESIZE 1
+/* #undef HAVE_GETPAGESIZE */
 
 /* Define to 1 if you have the `getpeereid' function. */
 /* #undef HAVE_GETPEEREID */
diff --git a/contrib/win32/openssh/openbsd_compat.vcxproj b/contrib/win32/openssh/openbsd_compat.vcxproj
index 0f2eaa6c7..5667162b6 100644
--- a/contrib/win32/openssh/openbsd_compat.vcxproj
+++ b/contrib/win32/openssh/openbsd_compat.vcxproj
@@ -75,7 +75,7 @@
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-irix.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-linux.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-solaris.c" />
-    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-tun.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-net.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-uw.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\readpassphrase.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\reallocarray.c" />
@@ -125,7 +125,7 @@
     <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-irix.h" />
     <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-linux.h" />
     <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-solaris.h" />
-    <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-tun.h" />
+    <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-net.h" />
     <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-uw.h" />
     <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\readpassphrase.h" />
     <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\rmd160.h" />
diff --git a/contrib/win32/openssh/openbsd_compat.vcxproj.filters b/contrib/win32/openssh/openbsd_compat.vcxproj.filters
index 673ff8f34..135cbcfd0 100644
--- a/contrib/win32/openssh/openbsd_compat.vcxproj.filters
+++ b/contrib/win32/openssh/openbsd_compat.vcxproj.filters
@@ -129,7 +129,7 @@
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-solaris.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-tun.c">
+    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-net.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-uw.c">
@@ -278,7 +278,7 @@
     <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-solaris.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-tun.h">
+    <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-net.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="$(OpenSSH-Src-Path)openbsd-compat\port-uw.h">
diff --git a/sftp.c b/sftp.c
index ca5e68151..d9592d67a 100644
--- a/sftp.c
+++ b/sftp.c
@@ -2544,8 +2544,10 @@ main(int argc, char **argv)
 			}
 			break;
 		}
-		if (argv + 1)
-			file2 = *(argv + 1);
+		
+		/* TODO: need to debug this. this parameter doesn't make sense
+		file2 = *(argv + 1);
+		*/
 
 		if (!*host) {
 			fprintf(stderr, "Missing hostname\n");
diff --git a/ssh.c b/ssh.c
index 5c26eac28..9ba83a16c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1915,6 +1915,7 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
 	 * NB. this can only happen after LocalCommand has completed,
 	 * as it may want to write to stdout.
 	 */
+#ifndef WINDOWS /* TODO - implement dup2 for Windows */
 	if (!need_controlpersist_detach) {
 		if ((devnull = open(_PATH_DEVNULL, O_WRONLY)) == -1)
 			error("%s: open %s: %s", __func__,
@@ -1924,6 +1925,7 @@ ssh_session2(struct ssh *ssh, struct passwd *pw)
 		if (devnull > STDERR_FILENO)
 			close(devnull);
 	}
+#endif
 
 	/*
 	 * If requested and we are not interested in replies to remote