summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac6
-rw-r--r--sshd_config2
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b939d6c56..225fd09c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
120020130 120020130
2 - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ 2 - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
3 - (tim) [configure.ac] fix logic on when ssh-rand-helper is installed.
4 [sshd_config] put back in line that tells what PATH was compiled into sshd.
3 5
420020125 620020125
5 - (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't 7 - (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't
@@ -7397,4 +7399,4 @@
7397 - Wrote replacements for strlcpy and mkdtemp 7399 - Wrote replacements for strlcpy and mkdtemp
7398 - Released 1.0pre1 7400 - Released 1.0pre1
7399 7401
7400$Id: ChangeLog,v 1.1797 2002/01/29 22:37:06 djm Exp $ 7402$Id: ChangeLog,v 1.1798 2002/01/31 06:14:03 tim Exp $
diff --git a/configure.ac b/configure.ac
index a23d32497..80d3e48d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.16 2002/01/23 00:21:01 djm Exp $ 1# $Id: configure.ac,v 1.17 2002/01/31 06:14:03 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -884,8 +884,8 @@ if test ! -z "$OPENSSL_SEEDS_ITSELF" -a -z "$USE_RAND_HELPER" ; then
884 AC_DEFINE(OPENSSL_PRNG_ONLY) 884 AC_DEFINE(OPENSSL_PRNG_ONLY)
885 RAND_MSG="OpenSSL internal ONLY" 885 RAND_MSG="OpenSSL internal ONLY"
886 INSTALL_SSH_RAND_HELPER="" 886 INSTALL_SSH_RAND_HELPER=""
887elif test ! -z "$OPENSSL_SEEDS_ITSELF" -a ! -z "$USE_RAND_HELPER" ; then 887elif test ! -z "$USE_RAND_HELPER" ; then
888 # OpenSSL with fallback to rand helper 888 # install rand helper
889 RAND_MSG="ssh-rand-helper" 889 RAND_MSG="ssh-rand-helper"
890 INSTALL_SSH_RAND_HELPER="yes" 890 INSTALL_SSH_RAND_HELPER="yes"
891fi 891fi
diff --git a/sshd_config b/sshd_config
index 9e62e9cf3..3502ab6ac 100644
--- a/sshd_config
+++ b/sshd_config
@@ -3,6 +3,8 @@
3# This is the sshd server system-wide configuration file. See sshd(8) 3# This is the sshd server system-wide configuration file. See sshd(8)
4# for more information. 4# for more information.
5 5
6# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
7
6# The stategy used for options in the default sshd_config shipped with 8# The stategy used for options in the default sshd_config shipped with
7# OpenSSH is to specify options with their default value where 9# OpenSSH is to specify options with their default value where
8# possible, but leave them commented. Uncommented options change a 10# possible, but leave them commented. Uncommented options change a