- (dtucker) [INSTALL] Group the parts describing random options and PAM

   implementations together which is hopefully more coherent.

diff --git a/ChangeLog b/ChangeLog
index da17e9475df73aa2fd88ae9bc100196cde6ade94..fa9e375af47ade7c3854f3bf1eea369bce4dd4ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (dtucker) [sshd.8] Many Linux variants use a single "!" to denote locked
    accounts and that's what the code looks for, so make man page and code
    agree.  Pointed out by Roumen Petrov.
+ - (dtucker) [INSTALL] Group the parts describing random options and PAM
+   implementations together which is hopefully more coherent.
 
 20070816
  - (dtucker) [session.c] Call PAM cleanup functions for unauthenticated

diff --git a/INSTALL b/INSTALL
index 3763d98bb885bae1e221ffc298e3af984cad878c..d63f86ea81fa3e454c203f07f952eb41b100aed2 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,31 +14,11 @@ Blowfish) do not work correctly.)
 
 The remaining items are optional.
 
-OpenSSH can utilise Pluggable Authentication Modules (PAM) if your
-system supports it. PAM is standard most Linux distributions, Solaris,
-HP-UX 11 and AIX >= 5.2.
-
 NB. If you operating system supports /dev/random, you should configure
 OpenSSL to use it. OpenSSH relies on OpenSSL's direct support of
-/dev/random. If you don't you will have to rely on ssh-rand-helper, which
-is inferior to a good kernel-based solution.
-
-Linux PAM:
-http://www.kernel.org/pub/linux/libs/pam/
-
-OpenPAM:
-http://www.openpam.org/
-
-If you wish to build the GNOME passphrase requester, you will need the GNOME
-libraries and headers.
-
-GNOME:
-http://www.gnome.org/
-
-Alternatively, Jim Knoble <jmknoble@pobox.com> has written an excellent X11
-passphrase requester. This is maintained separately at:
-
-http://www.jmknoble.net/software/x11-ssh-askpass/
+/dev/random, or failing that, either prngd or egd.  If you don't have
+any of these you will have to rely on ssh-rand-helper, which is inferior
+to a good kernel-based solution or prngd.
 
 PRNGD:
 
@@ -54,6 +34,27 @@ lacks /dev/random and don't want to use OpenSSH's internal entropy collection.
 
 http://www.lothar.com/tech/crypto/
 
+OpenSSH can utilise Pluggable Authentication Modules (PAM) if your
+system supports it. PAM is standard most Linux distributions, Solaris,
+HP-UX 11, AIX >= 5.2, FreeBSD and NetBSD.
+
+Information about the various PAM implementations are available:
+
+Solaris PAM:   http://www.sun.com/software/solaris/pam/
+Linux PAM:     http://www.kernel.org/pub/linux/libs/pam/
+OpenPAM:       http://www.openpam.org/
+
+If you wish to build the GNOME passphrase requester, you will need the GNOME
+libraries and headers.
+
+GNOME:
+http://www.gnome.org/
+
+Alternatively, Jim Knoble <jmknoble@pobox.com> has written an excellent X11
+passphrase requester. This is maintained separately at:
+
+http://www.jmknoble.net/software/x11-ssh-askpass/
+
 S/Key Libraries:
 
 If you wish to use --with-skey then you will need the library below