[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.

diff --git a/ChangeLog b/ChangeLog
index ca07ca40eed2c1426bf8418b99297fd90b428c96..f6e458159835a65fbd3df377948e1ae4e504b3e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 

diff --git a/configure.ac b/configure.ac
index 292a088d75e4d7987aee1571345c60a421cc3f04..1337e55b7c341cd689843e176920858d7a8fe52e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 9e62e9cf37b94f3107e1128d1edbc5333e068bda..3502ab6acec9841519b7f897d08299cc2d88318c 100644 (file)
--- 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