[configure.ac] fix logic on when ssh-rand-helper is installed.

[sshd_config] put back in line that tells what PATH was compiled into sshd.
This commit is contained in:
Tim Rice 2002-01-30 22:14:03 -08:00
parent 8eb7141758
commit 1e2c600892
3 changed files with 8 additions and 4 deletions

View File

@ -1,5 +1,7 @@
20020130 20020130
- (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
- (tim) [configure.ac] fix logic on when ssh-rand-helper is installed.
[sshd_config] put back in line that tells what PATH was compiled into sshd.
20020125 20020125
- (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't - (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't
@ -7397,4 +7399,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1797 2002/01/29 22:37:06 djm Exp $ $Id: ChangeLog,v 1.1798 2002/01/31 06:14:03 tim Exp $

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.16 2002/01/23 00:21:01 djm Exp $ # $Id: configure.ac,v 1.17 2002/01/31 06:14:03 tim Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -884,8 +884,8 @@ if test ! -z "$OPENSSL_SEEDS_ITSELF" -a -z "$USE_RAND_HELPER" ; then
AC_DEFINE(OPENSSL_PRNG_ONLY) AC_DEFINE(OPENSSL_PRNG_ONLY)
RAND_MSG="OpenSSL internal ONLY" RAND_MSG="OpenSSL internal ONLY"
INSTALL_SSH_RAND_HELPER="" INSTALL_SSH_RAND_HELPER=""
elif test ! -z "$OPENSSL_SEEDS_ITSELF" -a ! -z "$USE_RAND_HELPER" ; then elif test ! -z "$USE_RAND_HELPER" ; then
# OpenSSL with fallback to rand helper # install rand helper
RAND_MSG="ssh-rand-helper" RAND_MSG="ssh-rand-helper"
INSTALL_SSH_RAND_HELPER="yes" INSTALL_SSH_RAND_HELPER="yes"
fi fi

View File

@ -3,6 +3,8 @@
# This is the sshd server system-wide configuration file. See sshd(8) # This is the sshd server system-wide configuration file. See sshd(8)
# for more information. # for more information.
# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
# The stategy used for options in the default sshd_config shipped with # The stategy used for options in the default sshd_config shipped with
# OpenSSH is to specify options with their default value where # OpenSSH is to specify options with their default value where
# possible, but leave them commented. Uncommented options change a # possible, but leave them commented. Uncommented options change a