summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--servconf.c11
-rw-r--r--sshd.85
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 @@
153 - stevesk@cvs.openbsd.org 2001/03/04 11:04:41 153 - stevesk@cvs.openbsd.org 2001/03/04 11:04:41
154 [sshd.8] 154 [sshd.8]
155 small cleanup and clarify for PermitRootLogin; ok markus@ 155 small cleanup and clarify for PermitRootLogin; ok markus@
156 - stevesk@cvs.openbsd.org 2001/03/04 11:16:06
157 [servconf.c sshd.8]
158 kill obsolete RandomSeed; ok markus@ deraadt@
156 159
15720010304 16020010304
158 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 161 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4345,4 +4348,4 @@
4345 - Wrote replacements for strlcpy and mkdtemp 4348 - Wrote replacements for strlcpy and mkdtemp
4346 - Released 1.0pre1 4349 - Released 1.0pre1
4347 4350
4348$Id: ChangeLog,v 1.899 2001/03/05 07:40:40 mouring Exp $ 4351$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 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.68 2001/02/22 04:29:37 deraadt Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.69 2001/03/04 11:16:06 stevesk Exp $");
14 14
15#ifdef KRB4 15#ifdef KRB4
16#include <krb.h> 16#include <krb.h>
@@ -209,7 +209,7 @@ typedef enum {
209 sChallengeResponseAuthentication, 209 sChallengeResponseAuthentication,
210 sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, 210 sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress,
211 sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset, 211 sPrintMotd, sIgnoreRhosts, sX11Forwarding, sX11DisplayOffset,
212 sStrictModes, sEmptyPasswd, sRandomSeedFile, sKeepAlives, sCheckMail, 212 sStrictModes, sEmptyPasswd, sKeepAlives, sCheckMail,
213 sUseLogin, sAllowTcpForwarding, 213 sUseLogin, sAllowTcpForwarding,
214 sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, 214 sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
215 sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, 215 sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile,
@@ -261,7 +261,6 @@ static struct {
261 { "strictmodes", sStrictModes }, 261 { "strictmodes", sStrictModes },
262 { "permitemptypasswords", sEmptyPasswd }, 262 { "permitemptypasswords", sEmptyPasswd },
263 { "uselogin", sUseLogin }, 263 { "uselogin", sUseLogin },
264 { "randomseed", sRandomSeedFile },
265 { "keepalive", sKeepAlives }, 264 { "keepalive", sKeepAlives },
266 { "allowtcpforwarding", sAllowTcpForwarding }, 265 { "allowtcpforwarding", sAllowTcpForwarding },
267 { "allowusers", sAllowUsers }, 266 { "allowusers", sAllowUsers },
@@ -439,12 +438,6 @@ parse_filename:
439 charptr = &options->pid_file; 438 charptr = &options->pid_file;
440 goto parse_filename; 439 goto parse_filename;
441 440
442 case sRandomSeedFile:
443 fprintf(stderr, "%s line %d: \"randomseed\" option is obsolete.\n",
444 filename, linenum);
445 arg = strdelim(&cp);
446 break;
447
448 case sPermitRootLogin: 441 case sPermitRootLogin:
449 intptr = &options->permit_root_login; 442 intptr = &options->permit_root_login;
450 arg = strdelim(&cp); 443 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 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.100 2001/03/04 11:04:41 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.101 2001/03/04 11:16:06 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -612,9 +612,6 @@ and
612Multiple versions must be comma-separated. 612Multiple versions must be comma-separated.
613The default is 613The default is
614.Dq 1 . 614.Dq 1 .
615.It Cm RandomSeed
616Obsolete.
617Random number generation uses other techniques.
618.It Cm ReverseMappingCheck 615.It Cm ReverseMappingCheck
619Specifies whether 616Specifies whether
620.Nm 617.Nm