diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2004-03-11 10:21:18 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2004-03-11 10:21:18 +0000 |
| commit | 45a2f209eb11f99be397e443fb403e0614488953 (patch) | |
| tree | 49511add7ce53ad52d0de63178b43936cce42a35 /usr.bin | |
| parent | 13ae92f327f89ceef563b82bdf77a3ff20e0f344 (diff) | |
ssh, sshd: sync version output, ok djm
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 10 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index ca7e8ae03a2..48092e10b11 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -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> @@ -301,12 +301,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; diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 07dd911ef5f..61b9ac8bc83 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -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> @@ -747,7 +747,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" |