summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevesk <stevesk@openbsd.org>2001-03-04 11:16:06 +0000
committerstevesk <stevesk@openbsd.org>2001-03-04 11:16:06 +0000
commitd4145fe98d3cfbd015179da099df7ce6da3cae65 (patch)
tree6fb98544e55ef35089381b20340f508288eceab9
parentsmall cleanup and clarify for PermitRootLogin; ok markus@ (diff)
downloadwireguard-openbsd-d4145fe98d3cfbd015179da099df7ce6da3cae65.tar.xz
wireguard-openbsd-d4145fe98d3cfbd015179da099df7ce6da3cae65.zip
kill obsolete RandomSeed; ok markus@ deraadt@
-rw-r--r--usr.bin/ssh/servconf.c11
-rw-r--r--usr.bin/ssh/sshd.85
2 files changed, 3 insertions, 13 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index fdadea70d29..1e77d32f7ec 100644
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/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/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index d9daaee9720..77f0098f030 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/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