3 files changed, 13 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 03411c46b..78e70b107 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
      [sshd.c]
      remove undocumented -V option. would be only useful if openssh is used
      as ssh v1 server for ssh.com's ssh v2.
+   - markus@cvs.openbsd.org 2003/07/16 10:34:53
+     [ssh.c sshd.c]
+     don't exit on multiple -v or -d; ok deraadt@
 
 20030714
  - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
@@ -702,4 +705,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2858 2003/07/19 09:52:28 dtucker Exp $
+$Id: ChangeLog,v 1.2859 2003/07/19 09:54:31 dtucker Exp $
diff --git a/ssh.c b/ssh.c
index 1f1f06834..2bcd5871e 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 @@ again:
                         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,
diff --git a/sshd.c b/sshd.c
index e3748da7d..a8cb966b0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.272 2003/07/14 12:36:37 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.273 2003/07/16 10:34:53 markus Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -851,15 +851,11 @@ main(int ac, char **av)
                         config_file_name = optarg;
                         break;
                 case 'd':
-                        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) {
+                        } else if (options.log_level < SYSLOG_LEVEL_DEBUG3)
                                 options.log_level++;
-                        } else {
-                                fprintf(stderr, "Too high debugging level.\n");
-                                exit(1);
-                        }
                         break;
                 case 'D':
                         no_daemon_flag = 1;