diff options
| author | Tim Rice <tim@multitalents.net> | 2002-01-30 22:14:03 -0800 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2002-01-30 22:14:03 -0800 |
| commit | 1e2c600892c322e3c117bc111f0f8fbdce757a69 (patch) | |
| tree | cadc3e8be70831d630a8d69acd34da9fed2fbcdc | |
| parent | 8eb71417584914688f89a77170642c8ce58b1a3e (diff) | |
[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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | sshd_config | 2 |
3 files changed, 8 insertions, 4 deletions
@@ -1,5 +1,7 @@ 20020130 - (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 - (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't @@ -7397,4 +7399,4 @@ - Wrote replacements for strlcpy and mkdtemp - 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 $ diff --git a/configure.ac b/configure.ac index a23d3249..80d3e48d 100644 --- a/configure.ac +++ b/configure.ac @@ -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_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) RAND_MSG="OpenSSL internal ONLY" INSTALL_SSH_RAND_HELPER="" -elif test ! -z "$OPENSSL_SEEDS_ITSELF" -a ! -z "$USE_RAND_HELPER" ; then - # OpenSSL with fallback to rand helper +elif test ! -z "$USE_RAND_HELPER" ; then + # install rand helper RAND_MSG="ssh-rand-helper" INSTALL_SSH_RAND_HELPER="yes" fi diff --git a/sshd_config b/sshd_config index 9e62e9cf..3502ab6a 100644 --- a/sshd_config +++ b/sshd_config @@ -3,6 +3,8 @@ # This is the sshd server system-wide configuration file. See sshd(8) # 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 # OpenSSH is to specify options with their default value where # possible, but leave them commented. Uncommented options change a |