remove unnecessary changes

contrib/win32/openssh/OpenSSHTestHelper.psm1

@@ -206,8 +206,6 @@ WARNING: Following changes will be made to OpenSSH configuration
         }
         catch
         {
-            write-host "user:$user"
-            write-host "passwd:$($Script:OpenSSHTestAccountsPassword)"
             #only add the local user when it does not exists on the machine        
             net user $user $Script:OpenSSHTestAccountsPassword /ADD 2>&1 >> $Script:TestSetupLogFile
         }
@@ -591,7 +589,7 @@ function Get-UnitTestDirectory
     param
     (
         [ValidateSet('Debug', 'Release')]
-        [string]$Configuration = "Debug",
+        [string]$Configuration = "Release",
 
         [ValidateSet('x86', 'x64', '')]
         [string]$NativeHostArch = ""

contrib/win32/win32compat/ssh-agent/agent.c

@@ -214,8 +214,6 @@ agent_cleanup_connection(struct agent_connection* con)
 		sshagent_con_username = NULL;
 	}
 
-
-
 #ifdef ENABLE_PKCS11
 	if (sshagent_client_primary_token)
 		CloseHandle(sshagent_client_primary_token);

contrib/win32/win32compat/w32fd.c

@@ -1074,10 +1074,7 @@ spawn_child_internal(const char* cmd, char *const argv[], HANDLE in, HANDLE out,
 	if (strstr(cmd, "sshd.exe")) {
 		flags |= DETACHED_PROCESS;
 	}
-	if (strstr(cmd, "ssh-pkcs11-helper.exe")) {
+	if (strstr(cmd, "ssh-pkcs11-helper.exe") || is_bash_test_env()) {
-		flags |= CREATE_NO_WINDOW;
-	}
-	if (is_bash_test_env()) {
 		flags |= CREATE_NO_WINDOW;
 	}
 	

regress/exit-status-signal.sh

@@ -15,12 +15,9 @@ while [ ! -f $OBJ/remote_pid ] && [ $n -gt 0 ]; do
 	sleep 1
 done
 
-echo "killing ssh_pid:$ssh_pid"
 kill $ssh_pid
-echo "waiting for ssh_pid:$ssh_pid"
 wait $ssh_pid
 exit_code=$?
-echo "exit_code:$exit_code"
 
 if [ $exit_code -eq 0 ]; then
 	fail "ssh client should fail on signal"

regress/test-exec.sh

@@ -527,7 +527,6 @@ cat << EOF > $OBJ/sshd_config
 	PidFile			$PIDFILE
 	AuthorizedKeysFile	$OBJ/authorized_keys_%u
 	LogLevel		DEBUG3
-	SyslogFacility LOCAL0
 	AcceptEnv		_XXX_TEST_*
 	AcceptEnv		_XXX_TEST
 	Subsystem	sftp	$SFTPSERVER

session.c

@@ -1192,12 +1192,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
 
 	if (debug_flag) {
 		/* dump the environment */
-		debug3("Environment:\n");
 		fprintf(stderr, "Environment:");
-		for (i = 0; env[i]; i++) {
+		for (i = 0; env[i]; i++)
 			fprintf(stderr, "  %.200s\n", env[i]);
-			debug3("  %.200s", env[i]);
-		}
 	}
 	return env;
 }

sftp-client.c

@@ -37,7 +37,13 @@
 
 #include <dirent.h>
 #include <errno.h>
-
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
+# ifdef HAVE_SYS_POLL_H
+#  include <sys/poll.h>
+# endif
+#endif
 #include <fcntl.h>
 #include <signal.h>
 #include <stdarg.h>
@@ -58,13 +64,6 @@
 #include "sftp.h"
 #include "sftp-common.h"
 #include "sftp-client.h"
-#ifdef HAVE_POLL_H
-#include <poll.h>
-#else
-# ifdef HAVE_SYS_POLL_H
-#  include <sys/poll.h>
-# endif
-#endif
 extern volatile sig_atomic_t interrupted;
 extern int showprogress;
 

sftp.c

@@ -2263,7 +2263,6 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
 			break;
 		}
 #endif
-		
 		interrupted = 0;
 		if (el == NULL) {
 			if (interactive)