===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshconnect.c,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- src/usr.bin/ssh/sshconnect.c	2018/11/16 06:17:38	1.307
+++ src/usr.bin/ssh/sshconnect.c	2018/11/18 22:43:29	1.308
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.307 2018/11/16 06:17:38 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.308 2018/11/18 22:43:29 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -150,7 +150,8 @@
 		 * Stderr is left for non-ControlPersist connections is so
 		 * error messages may be printed on the user's terminal.
 		 */
-		if (debug_flag || !options.control_persist)
+		if (!debug_flag && options.control_path != NULL &&
+		    options.control_persist)
 			stderr_null();
 
 		argv[0] = shell;
@@ -232,7 +233,8 @@
 		 * Stderr is left for non-ControlPersist connections is so
 		 * error messages may be printed on the user's terminal.
 		 */
-		if (debug_flag || !options.control_persist)
+		if (!debug_flag && options.control_path != NULL &&
+		    options.control_persist)
 			stderr_null();
 
 		argv[0] = shell;