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 2004/03/11 10:21:17 

[ssh.c sshd.c]
     ssh, sshd: sync version output, ok djm
This commit is contained in:
Damien Miller 2004-03-22 09:36:00 +11:00
parent b408786db9
commit 0c889cd9e9
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -10,6 +10,9 @@
- markus@cvs.openbsd.org 2004/03/11 08:36:26 - markus@cvs.openbsd.org 2004/03/11 08:36:26
[sshd.c] [sshd.c]
trim usage; ok deraadt trim usage; ok deraadt
- markus@cvs.openbsd.org 2004/03/11 10:21:17
[ssh.c sshd.c]
ssh, sshd: sync version output, ok djm
20040311 20040311
- (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker
@ -911,4 +914,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3292 2004/03/21 22:35:21 djm Exp $ $Id: ChangeLog,v 1.3293 2004/03/21 22:36:00 djm Exp $

10
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.208 2004/03/10 09:45:06 markus Exp $"); RCSID("$OpenBSD: ssh.c,v 1.209 2004/03/11 10:21:17 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -310,12 +310,8 @@ again:
} }
/* fallthrough */ /* fallthrough */
case 'V': case 'V':
fprintf(stderr, fprintf(stderr, "%s, %s\n",
"%s, SSH protocols %d.%d/%d.%d, %s\n", SSH_VERSION, SSLeay_version(SSLEAY_VERSION));
SSH_VERSION,
PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1,
PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
SSLeay_version(SSLEAY_VERSION));
if (opt == 'V') if (opt == 'V')
exit(0); exit(0);
break; break;

4
sshd.c
View File

@ -42,7 +42,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.289 2004/03/11 08:36:26 markus Exp $"); RCSID("$OpenBSD: sshd.c,v 1.290 2004/03/11 10:21:17 markus Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -763,7 +763,7 @@ drop_connection(int startups)
static void static void
usage(void) usage(void)
{ {
fprintf(stderr, "sshd version %s, %s\n", fprintf(stderr, "%s, %s\n",
SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); SSH_VERSION, SSLeay_version(SSLEAY_VERSION));
fprintf(stderr, fprintf(stderr,
"usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n" "usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n"