diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sshd.c | 5 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20031003 | ||
2 | - OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2003/10/02 10:41:59 | ||
4 | [sshd.c] | ||
5 | print openssl version, too, several requests; ok henning/djm. | ||
6 | |||
1 | 20031002 | 7 | 20031002 |
2 | - OpenBSD CVS Sync | 8 | - OpenBSD CVS Sync |
3 | - markus@cvs.openbsd.org 2003/09/23 20:17:11 | 9 | - markus@cvs.openbsd.org 2003/09/23 20:17:11 |
@@ -1268,4 +1274,4 @@ | |||
1268 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1274 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1269 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1275 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1270 | 1276 | ||
1271 | $Id: ChangeLog,v 1.3053 2003/10/02 10:07:09 dtucker Exp $ | 1277 | $Id: ChangeLog,v 1.3054 2003/10/03 07:57:24 dtucker Exp $ |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.279 2003/09/26 08:19:29 markus Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.280 2003/10/02 10:41:59 markus Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -758,7 +758,8 @@ drop_connection(int startups) | |||
758 | static void | 758 | static void |
759 | usage(void) | 759 | usage(void) |
760 | { | 760 | { |
761 | fprintf(stderr, "sshd version %s\n", SSH_VERSION); | 761 | fprintf(stderr, "sshd version %s, %s\n", |
762 | SSH_VERSION, SSLeay_version(SSLEAY_VERSION)); | ||
762 | fprintf(stderr, "Usage: %s [options]\n", __progname); | 763 | fprintf(stderr, "Usage: %s [options]\n", __progname); |
763 | fprintf(stderr, "Options:\n"); | 764 | fprintf(stderr, "Options:\n"); |
764 | fprintf(stderr, " -f file Configuration file (default %s)\n", _PATH_SERVER_CONFIG_FILE); | 765 | fprintf(stderr, " -f file Configuration file (default %s)\n", _PATH_SERVER_CONFIG_FILE); |