3 files changed, 7 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ef16f5ff..3b631ed71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -153,6 +153,9 @@
    - stevesk@cvs.openbsd.org 2001/03/04 11:04:41
      [sshd.8]
      small cleanup and clarify for PermitRootLogin; ok markus@
+   - stevesk@cvs.openbsd.org 2001/03/04 11:16:06
+     [servconf.c sshd.8]
+     kill obsolete RandomSeed; ok markus@ deraadt@
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4345,4 +4348,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.899 2001/03/05 07:40:40 mouring Exp $
+$Id: ChangeLog,v 1.900 2001/03/05 07:42:03 mouring Exp $
diff --git a/servconf.c b/servconf.c
index fdadea70d..1e77d32f7 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.68 2001/02/22 04:29:37 deraadt Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.69 2001/03/04 11:16:06 stevesk Exp $");
 
 #ifdef KRB4
 #include <krb.h>
@@ -209,7 +209,7 @@ typedef enum {
         sChallengeResponseAuthentication,
         sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress,
         sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,
-        sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail,
+        sStrictModes, sEmptyPasswd, sKeepAlives, sCheckMail,
         sUseLogin, sAllowTcpForwarding,
         sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
         sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,
@@ -261,7 +261,6 @@ static struct {
         { "strictmodes", sStrictModes },
         { "permitemptypasswords", sEmptyPasswd },
         { "uselogin", sUseLogin },
-        { "randomseed", sRandomSeedFile },
         { "keepalive", sKeepAlives },
         { "allowtcpforwarding", sAllowTcpForwarding },
         { "allowusers", sAllowUsers },
@@ -439,12 +438,6 @@ parse_filename:
                         charptr = &options->pid_file;
                         goto parse_filename;
 
-                case sRandomSeedFile:
-                        fprintf(stderr, "%s line %d: \"randomseed\" option is obsolete.\n",
-                                filename, linenum);
-                        arg = strdelim(&cp);
-                        break;
-
                 case sPermitRootLogin:
                         intptr = &options->permit_root_login;
                         arg = strdelim(&cp);
diff --git a/sshd.8 b/sshd.8
index fadfe6ba3..cf9392754 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.100 2001/03/04 11:04:41 stevesk Exp $
+.\" $OpenBSD: sshd.8,v 1.101 2001/03/04 11:16:06 stevesk Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -612,9 +612,6 @@ and
 Multiple versions must be comma-separated.
 The default is
 .Dq 1 .
-.It Cm RandomSeed
-Obsolete.
-Random number generation uses other techniques.
 .It Cm ReverseMappingCheck
 Specifies whether
 .Nm