mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-26 15:24:47 +02:00
- Print whether OpenSSH was compiled with RSARef, patch from
Nalin Dahyabhai <nalin@thermo.stat.ncsu.edu>
This commit is contained in:
parent
e79334a2b0
commit
d00d1611e4
@ -4,6 +4,8 @@
|
|||||||
- Fix --with-default-path option.
|
- Fix --with-default-path option.
|
||||||
- Autodetect perl, patch from David Rankin
|
- Autodetect perl, patch from David Rankin
|
||||||
<drankin@bohemians.lexington.ky.us>
|
<drankin@bohemians.lexington.ky.us>
|
||||||
|
- Print whether OpenSSH was compiled with RSARef, patch from
|
||||||
|
Nalin Dahyabhai <nalin@thermo.stat.ncsu.edu>
|
||||||
|
|
||||||
19991228
|
19991228
|
||||||
- Replacement for getpagesize() for systems which lack it
|
- Replacement for getpagesize() for systems which lack it
|
||||||
|
@ -30,6 +30,10 @@
|
|||||||
/* Define if your ssl headers are included with #include <openssl/header.h> */
|
/* Define if your ssl headers are included with #include <openssl/header.h> */
|
||||||
#undef HAVE_OPENSSL
|
#undef HAVE_OPENSSL
|
||||||
|
|
||||||
|
/* Define if you are linking against RSAref. Used only to print the right
|
||||||
|
* message at run-time. */
|
||||||
|
#undef RSAREF
|
||||||
|
|
||||||
/* Define is utmp.h has a ut_host field */
|
/* Define is utmp.h has a ut_host field */
|
||||||
#undef HAVE_HOST_IN_UTMP
|
#undef HAVE_HOST_IN_UTMP
|
||||||
|
|
||||||
|
@ -96,7 +96,8 @@ AC_MSG_CHECKING([for RSAref library])
|
|||||||
saved_LIBS="$LIBS"
|
saved_LIBS="$LIBS"
|
||||||
LIBS="$saved_LIBS -lRSAglue -lrsaref"
|
LIBS="$saved_LIBS -lRSAglue -lrsaref"
|
||||||
AC_TRY_LINK([], [],
|
AC_TRY_LINK([], [],
|
||||||
[AC_MSG_RESULT(yes); ],
|
[AC_MSG_RESULT(yes);
|
||||||
|
AC_DEFINE(RSAREF)],
|
||||||
[AC_MSG_RESULT(no)]; LIBS="$saved_LIBS")
|
[AC_MSG_RESULT(no)]; LIBS="$saved_LIBS")
|
||||||
|
|
||||||
dnl Checks for libraries.
|
dnl Checks for libraries.
|
||||||
|
6
ssh.c
6
ssh.c
@ -11,7 +11,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$Id: ssh.c,v 1.14 1999/12/13 23:47:16 damien Exp $");
|
RCSID("$Id: ssh.c,v 1.15 1999/12/28 23:17:09 damien Exp $");
|
||||||
|
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
@ -305,7 +305,11 @@ main(int ac, char **av)
|
|||||||
case 'V':
|
case 'V':
|
||||||
fprintf(stderr, "SSH Version %s, protocol version %d.%d.\n",
|
fprintf(stderr, "SSH Version %s, protocol version %d.%d.\n",
|
||||||
SSH_VERSION, PROTOCOL_MAJOR, PROTOCOL_MINOR);
|
SSH_VERSION, PROTOCOL_MAJOR, PROTOCOL_MINOR);
|
||||||
|
#ifndef RSAREF
|
||||||
fprintf(stderr, "Compiled with SSL.\n");
|
fprintf(stderr, "Compiled with SSL.\n");
|
||||||
|
#else
|
||||||
|
fprintf(stderr, "Compiled with SSL (RSAref version).\n");
|
||||||
|
#endif
|
||||||
if (opt == 'V')
|
if (opt == 'V')
|
||||||
exit(0);
|
exit(0);
|
||||||
debug_flag = 1;
|
debug_flag = 1;
|
||||||
|
5
sshd.c
5
sshd.c
@ -11,7 +11,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$Id: sshd.c,v 1.46 1999/12/28 04:09:36 damien Exp $");
|
RCSID("$Id: sshd.c,v 1.47 1999/12/28 23:17:09 damien Exp $");
|
||||||
|
|
||||||
#ifdef HAVE_POLL_H
|
#ifdef HAVE_POLL_H
|
||||||
# include <poll.h>
|
# include <poll.h>
|
||||||
@ -510,6 +510,9 @@ main(int ac, char **av)
|
|||||||
case '?':
|
case '?':
|
||||||
default:
|
default:
|
||||||
fprintf(stderr, "sshd version %s\n", SSH_VERSION);
|
fprintf(stderr, "sshd version %s\n", SSH_VERSION);
|
||||||
|
#ifdef RSAREF
|
||||||
|
fprintf(stderr, "Compiled with RSAref.\n");
|
||||||
|
#endif
|
||||||
fprintf(stderr, "Usage: %s [options]\n", av0);
|
fprintf(stderr, "Usage: %s [options]\n", av0);
|
||||||
fprintf(stderr, "Options:\n");
|
fprintf(stderr, "Options:\n");
|
||||||
fprintf(stderr, " -f file Configuration file (default %s)\n", SERVER_CONFIG_FILE);
|
fprintf(stderr, " -f file Configuration file (default %s)\n", SERVER_CONFIG_FILE);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user