diff options
author | Damien Miller <djm@mindrot.org> | 2004-03-22 09:36:00 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-03-22 09:36:00 +1100 |
commit | 0c889cd9e9b3e6f628e650e160a6ba8443fa3604 (patch) | |
tree | 9e1cea2cfc7c6b195886c083d75ef6b68a51e5db | |
parent | b408786db92c76bcff026c22e256d8b3485309ad (diff) |
- markus@cvs.openbsd.org 2004/03/11 10:21:17
[ssh.c sshd.c]
ssh, sshd: sync version output, ok djm
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 10 | ||||
-rw-r--r-- | sshd.c | 4 |
3 files changed, 9 insertions, 10 deletions
@@ -10,6 +10,9 @@ - markus@cvs.openbsd.org 2004/03/11 08:36:26 [sshd.c] 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 - (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) 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 $ @@ -40,7 +40,7 @@ */ #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/err.h> @@ -310,12 +310,8 @@ again: } /* fallthrough */ case 'V': - fprintf(stderr, - "%s, SSH protocols %d.%d/%d.%d, %s\n", - SSH_VERSION, - PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1, - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, - SSLeay_version(SSLEAY_VERSION)); + fprintf(stderr, "%s, %s\n", + SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); if (opt == 'V') exit(0); break; @@ -42,7 +42,7 @@ */ #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/bn.h> @@ -763,7 +763,7 @@ drop_connection(int startups) static void usage(void) { - fprintf(stderr, "sshd version %s, %s\n", + fprintf(stderr, "%s, %s\n", SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); fprintf(stderr, "usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n" |