From: cphillip <cphillip>
Date: Mon, 21 Oct 2002 15:42:47 +0000 (+0000)
Subject:   o Merge in new copies of the configuration files from 3.5p1.
X-Git-Tag: NMI_REL_2_1~1
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/e8800bf18d417b8ea72957622ab4896b1eaa3f90

  o Merge in new copies of the configuration files from 3.5p1.
---

diff --git a/setup/ssh_config b/setup/ssh_config
index ef31d43..94cffbf 100644
--- a/setup/ssh_config
+++ b/setup/ssh_config
@@ -1,4 +1,4 @@
-#	$OpenBSD: ssh_config,v 1.15 2002/06/20 20:03:34 stevesk Exp $
+#	$OpenBSD: ssh_config,v 1.16 2002/07/03 14:21:05 markus Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -22,6 +22,7 @@
 #   RhostsRSAAuthentication no
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
+#   HostbasedAuthentication no
 #   BatchMode no
 #   CheckHostIP yes
 #   StrictHostKeyChecking ask
diff --git a/setup/ssh_prng_cmds.in b/setup/ssh_prng_cmds.in
index 2473a0b..37069a9 100644
--- a/setup/ssh_prng_cmds.in
+++ b/setup/ssh_prng_cmds.in
@@ -37,7 +37,7 @@
 "netstat -s"				@PROG_NETSTAT@	0.02
 "netstat -is"				@PROG_NETSTAT@	0.07
 
-"arp -a -n"				@PROG_ARP@	0.02
+"arp -n -a"				@PROG_ARP@	0.02
 
 "ifconfig -a"				@PROG_IFCONFIG@	0.02
 
diff --git a/setup/sshd_config.in b/setup/sshd_config.in
index 770be5e..95e6a5d 100644
--- a/setup/sshd_config.in
+++ b/setup/sshd_config.in
@@ -1,4 +1,4 @@
-#       $OpenBSD: sshd_config,v 1.56 2002/06/20 23:37:12 markus Exp $
+#     $OpenBSD: sshd_config,v 1.59 2002/09/25 11:17:16 markus Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -32,7 +32,7 @@
 
 # Authentication:
 
-#LoginGraceTime 600
+#LoginGraceTime 120
 #PermitRootLogin yes
 #StrictModes yes
 
@@ -71,7 +71,7 @@
 
 # Set this to 'yes' to enable PAM keyboard-interactive authentication 
 # Warning: enabling this may bypass the setting of 'PasswordAuthentication'
-#PAMAuthenticationViaKbdInt yes
+#PAMAuthenticationViaKbdInt no
 
 #X11Forwarding no
 #X11DisplayOffset 10
@@ -81,6 +81,7 @@
 #KeepAlive yes
 #UseLogin no
 #UsePrivilegeSeparation yes
+#PermitUserEnvironment no
 #Compression yes
 
 #MaxStartups 10