tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2003/07/16 10:34:53 

[ssh.c sshd.c]
     don't exit on multiple -v or -d; ok deraadt@
This commit is contained in:
Darren Tucker 2003-07-19 19:54:31 +10:00
parent fe0078ae49
commit e98dfa323e
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -6,6 +6,9 @@
[sshd.c] [sshd.c]
remove undocumented -V option. would be only useful if openssh is used remove undocumented -V option. would be only useful if openssh is used
as ssh v1 server for ssh.com's ssh v2. 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 20030714
- (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare - (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. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

10
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -338,14 +338,14 @@ again:
tty_flag = 1; tty_flag = 1;
break; break;
case 'v': case 'v':
if (0 == debug_flag) { if (debug_flag == 0) {
debug_flag = 1; debug_flag = 1;
options.log_level = SYSLOG_LEVEL_DEBUG1; 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++; options.log_level++;
break; break;
} else }
fatal("Too high debugging level.");
/* fallthrough */ /* fallthrough */
case 'V': case 'V':
fprintf(stderr, fprintf(stderr,

10
sshd.c
View File

@ -42,7 +42,7 @@
*/ */
#include "includes.h" #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/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -851,15 +851,11 @@ main(int ac, char **av)
config_file_name = optarg; config_file_name = optarg;
break; break;
case 'd': case 'd':
if (0 == debug_flag) { if (debug_flag == 0) {
debug_flag = 1; debug_flag = 1;
options.log_level = SYSLOG_LEVEL_DEBUG1; 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++; options.log_level++;
} else {
fprintf(stderr, "Too high debugging level.\n");
exit(1);
}
break; break;
case 'D': case 'D':
no_daemon_flag = 1; no_daemon_flag = 1;