commit e98dfa323e7f7dc57afb70f99851a596f3194047
author Darren Tucker <dtucker@zip.com.au> Sat Jul 19 19:54:31 2003 +1000
committer Darren Tucker <dtucker@zip.com.au> Sat Jul 19 19:54:31 2003 +1000
tree cc72d5d819b1079a22254feb483bdf41dd492122
parent fe0078ae492ab0c020fa6ee5bccd8d08ca5f47a6

   - markus@cvs.openbsd.org 2003/07/16 10:34:53
     [ssh.c sshd.c]
     don't exit on multiple -v or -d; ok deraadt@

ssh.c

diff --git a/ssh.c b/ssh.c
index 1f1f068..2bcd587 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.196 2003/07/03 08:09:06 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.197 2003/07/16 10:34:53 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -338,14 +338,14 @@
 			tty_flag = 1;
 			break;
 		case 'v':
-			if (0 == debug_flag) {
+			if (debug_flag == 0) {
 				debug_flag = 1;
 				options.log_level = SYSLOG_LEVEL_DEBUG1;
-			} else if (options.log_level < SYSLOG_LEVEL_DEBUG3) {
-				options.log_level++;
+			} else {
+				if (options.log_level < SYSLOG_LEVEL_DEBUG3)
+					options.log_level++;
 				break;
-			} else
-				fatal("Too high debugging level.");
+			}
 			/* fallthrough */
 		case 'V':
 			fprintf(stderr,