From f899e6a5265ac173acbac51022a2512643ec909c Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 14 Mar 2005 23:02:46 +1100
Subject: [PATCH] 20050312  - (dtucker) [regress/test-exec.sh] DEBUG can cause
 problems where debug    output ends up in the client's output, causing
 regress failures.  Found    by Corinna Vinschen.

(got 4.0 branch and HEAD slightly askew, this is to resync)
---
 ChangeLog            | 7 ++++++-
 regress/test-exec.sh | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 897f1c582..2fd25234c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,11 @@
    localized name of the local administrators group more reliable.  From
    vinschen at redhat.com.
 
+20050312
+ - (dtucker) [regress/test-exec.sh] DEBUG can cause problems where debug
+   output ends up in the client's output, causing regress failures.  Found
+   by Corinna Vinschen.
+
 20050309
  - (dtucker) [regress/test-exec.sh] Set BIN_SH=xpg4 on OSF1/Digital Unix/Tru64
    so that regress tests behave.  From Chris Adams.
@@ -2333,4 +2338,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3710 2005/03/14 11:58:40 dtucker Exp $
+$Id: ChangeLog,v 1.3711 2005/03/14 12:02:46 dtucker Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 4e53449be..bd0c025ba 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -197,7 +197,7 @@ cat << EOF > $OBJ/sshd_config
 	#ListenAddress		::1
 	PidFile			$PIDFILE
 	AuthorizedKeysFile	$OBJ/authorized_keys_%u
-	LogLevel		DEBUG
+	LogLevel		VERBOSE
 	AcceptEnv		_XXX_TEST_*
 	AcceptEnv		_XXX_TEST
 	Subsystem	sftp	$SFTPSERVER