diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | acconfig.h | 4 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | ssh.c | 6 | ||||
-rw-r--r-- | sshd.c | 5 |
5 files changed, 17 insertions, 3 deletions
@@ -4,6 +4,8 @@ | |||
4 | - Fix --with-default-path option. | 4 | - Fix --with-default-path option. |
5 | - Autodetect perl, patch from David Rankin | 5 | - Autodetect perl, patch from David Rankin |
6 | <drankin@bohemians.lexington.ky.us> | 6 | <drankin@bohemians.lexington.ky.us> |
7 | - Print whether OpenSSH was compiled with RSARef, patch from | ||
8 | Nalin Dahyabhai <nalin@thermo.stat.ncsu.edu> | ||
7 | 9 | ||
8 | 19991228 | 10 | 19991228 |
9 | - Replacement for getpagesize() for systems which lack it | 11 | - Replacement for getpagesize() for systems which lack it |
diff --git a/acconfig.h b/acconfig.h index dc0c28185..c64eb72a8 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -30,6 +30,10 @@ | |||
30 | /* Define if your ssl headers are included with #include <openssl/header.h> */ | 30 | /* Define if your ssl headers are included with #include <openssl/header.h> */ |
31 | #undef HAVE_OPENSSL | 31 | #undef HAVE_OPENSSL |
32 | 32 | ||
33 | /* Define if you are linking against RSAref. Used only to print the right | ||
34 | * message at run-time. */ | ||
35 | #undef RSAREF | ||
36 | |||
33 | /* Define is utmp.h has a ut_host field */ | 37 | /* Define is utmp.h has a ut_host field */ |
34 | #undef HAVE_HOST_IN_UTMP | 38 | #undef HAVE_HOST_IN_UTMP |
35 | 39 | ||
diff --git a/configure.in b/configure.in index ae8afdf4d..581380ae2 100644 --- a/configure.in +++ b/configure.in | |||
@@ -96,7 +96,8 @@ AC_MSG_CHECKING([for RSAref library]) | |||
96 | saved_LIBS="$LIBS" | 96 | saved_LIBS="$LIBS" |
97 | LIBS="$saved_LIBS -lRSAglue -lrsaref" | 97 | LIBS="$saved_LIBS -lRSAglue -lrsaref" |
98 | AC_TRY_LINK([], [], | 98 | AC_TRY_LINK([], [], |
99 | [AC_MSG_RESULT(yes); ], | 99 | [AC_MSG_RESULT(yes); |
100 | AC_DEFINE(RSAREF)], | ||
100 | [AC_MSG_RESULT(no)]; LIBS="$saved_LIBS") | 101 | [AC_MSG_RESULT(no)]; LIBS="$saved_LIBS") |
101 | 102 | ||
102 | dnl Checks for libraries. | 103 | dnl Checks for libraries. |
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "includes.h" | 13 | #include "includes.h" |
14 | RCSID("$Id: ssh.c,v 1.14 1999/12/13 23:47:16 damien Exp $"); | 14 | RCSID("$Id: ssh.c,v 1.15 1999/12/28 23:17:09 damien Exp $"); |
15 | 15 | ||
16 | #include "xmalloc.h" | 16 | #include "xmalloc.h" |
17 | #include "ssh.h" | 17 | #include "ssh.h" |
@@ -305,7 +305,11 @@ main(int ac, char **av) | |||
305 | case 'V': | 305 | case 'V': |
306 | fprintf(stderr, "SSH Version %s, protocol version %d.%d.\n", | 306 | fprintf(stderr, "SSH Version %s, protocol version %d.%d.\n", |
307 | SSH_VERSION, PROTOCOL_MAJOR, PROTOCOL_MINOR); | 307 | SSH_VERSION, PROTOCOL_MAJOR, PROTOCOL_MINOR); |
308 | #ifndef RSAREF | ||
308 | fprintf(stderr, "Compiled with SSL.\n"); | 309 | fprintf(stderr, "Compiled with SSL.\n"); |
310 | #else | ||
311 | fprintf(stderr, "Compiled with SSL (RSAref version).\n"); | ||
312 | #endif | ||
309 | if (opt == 'V') | 313 | if (opt == 'V') |
310 | exit(0); | 314 | exit(0); |
311 | debug_flag = 1; | 315 | debug_flag = 1; |
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "includes.h" | 13 | #include "includes.h" |
14 | RCSID("$Id: sshd.c,v 1.46 1999/12/28 04:09:36 damien Exp $"); | 14 | RCSID("$Id: sshd.c,v 1.47 1999/12/28 23:17:09 damien Exp $"); |
15 | 15 | ||
16 | #ifdef HAVE_POLL_H | 16 | #ifdef HAVE_POLL_H |
17 | # include <poll.h> | 17 | # include <poll.h> |
@@ -510,6 +510,9 @@ main(int ac, char **av) | |||
510 | case '?': | 510 | case '?': |
511 | default: | 511 | default: |
512 | fprintf(stderr, "sshd version %s\n", SSH_VERSION); | 512 | fprintf(stderr, "sshd version %s\n", SSH_VERSION); |
513 | #ifdef RSAREF | ||
514 | fprintf(stderr, "Compiled with RSAref.\n"); | ||
515 | #endif | ||
513 | fprintf(stderr, "Usage: %s [options]\n", av0); | 516 | fprintf(stderr, "Usage: %s [options]\n", av0); |
514 | fprintf(stderr, "Options:\n"); | 517 | fprintf(stderr, "Options:\n"); |
515 | fprintf(stderr, " -f file Configuration file (default %s)\n", SERVER_CONFIG_FILE); | 518 | fprintf(stderr, " -f file Configuration file (default %s)\n", SERVER_CONFIG_FILE); |