diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-07-19 19:54:31 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-07-19 19:54:31 +1000 |
commit | e98dfa323e7f7dc57afb70f99851a596f3194047 (patch) | |
tree | cc72d5d819b1079a22254feb483bdf41dd492122 | |
parent | fe0078ae492ab0c020fa6ee5bccd8d08ca5f47a6 (diff) |
- markus@cvs.openbsd.org 2003/07/16 10:34:53
[ssh.c sshd.c]
don't exit on multiple -v or -d; ok deraadt@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 12 | ||||
-rw-r--r-- | sshd.c | 10 |
3 files changed, 13 insertions, 14 deletions
@@ -6,6 +6,9 @@ | |||
6 | [sshd.c] | 6 | [sshd.c] |
7 | remove undocumented -V option. would be only useful if openssh is used | 7 | remove undocumented -V option. would be only useful if openssh is used |
8 | as ssh v1 server for ssh.com's ssh v2. | 8 | as ssh v1 server for ssh.com's ssh v2. |
9 | - markus@cvs.openbsd.org 2003/07/16 10:34:53 | ||
10 | [ssh.c sshd.c] | ||
11 | don't exit on multiple -v or -d; ok deraadt@ | ||
9 | 12 | ||
10 | 20030714 | 13 | 20030714 |
11 | - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare | 14 | - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare |
@@ -702,4 +705,4 @@ | |||
702 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 705 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
703 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 706 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
704 | 707 | ||
705 | $Id: ChangeLog,v 1.2858 2003/07/19 09:52:28 dtucker Exp $ | 708 | $Id: ChangeLog,v 1.2859 2003/07/19 09:54:31 dtucker Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.196 2003/07/03 08:09:06 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.197 2003/07/16 10:34:53 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -338,14 +338,14 @@ again: | |||
338 | tty_flag = 1; | 338 | tty_flag = 1; |
339 | break; | 339 | break; |
340 | case 'v': | 340 | case 'v': |
341 | if (0 == debug_flag) { | 341 | if (debug_flag == 0) { |
342 | debug_flag = 1; | 342 | debug_flag = 1; |
343 | options.log_level = SYSLOG_LEVEL_DEBUG1; | 343 | options.log_level = SYSLOG_LEVEL_DEBUG1; |
344 | } else if (options.log_level < SYSLOG_LEVEL_DEBUG3) { | 344 | } else { |
345 | options.log_level++; | 345 | if (options.log_level < SYSLOG_LEVEL_DEBUG3) |
346 | options.log_level++; | ||
346 | break; | 347 | break; |
347 | } else | 348 | } |
348 | fatal("Too high debugging level."); | ||
349 | /* fallthrough */ | 349 | /* fallthrough */ |
350 | case 'V': | 350 | case 'V': |
351 | fprintf(stderr, | 351 | fprintf(stderr, |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.272 2003/07/14 12:36:37 markus Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.273 2003/07/16 10:34:53 markus Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -851,15 +851,11 @@ main(int ac, char **av) | |||
851 | config_file_name = optarg; | 851 | config_file_name = optarg; |
852 | break; | 852 | break; |
853 | case 'd': | 853 | case 'd': |
854 | if (0 == debug_flag) { | 854 | if (debug_flag == 0) { |
855 | debug_flag = 1; | 855 | debug_flag = 1; |
856 | options.log_level = SYSLOG_LEVEL_DEBUG1; | 856 | options.log_level = SYSLOG_LEVEL_DEBUG1; |
857 | } else if (options.log_level < SYSLOG_LEVEL_DEBUG3) { | 857 | } else if (options.log_level < SYSLOG_LEVEL_DEBUG3) |
858 | options.log_level++; | 858 | options.log_level++; |
859 | } else { | ||
860 | fprintf(stderr, "Too high debugging level.\n"); | ||
861 | exit(1); | ||
862 | } | ||
863 | break; | 859 | break; |
864 | case 'D': | 860 | case 'D': |
865 | no_daemon_flag = 1; | 861 | no_daemon_flag = 1; |