diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-04-15 21:05:50 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2001-04-15 21:05:50 +0000 |
| commit | c40fae529da55e43ef36b5522bc44398c8624eb6 (patch) | |
| tree | 43ad683e73ac5e25c831712e787dfd71cc0fbb25 /usr.bin/ssh | |
| parent | f824a4c40fc60ef0d990e32f23a7b7a0adcb4795 (diff) | |
default for protocol is 1,2; ok markus@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/sshd.8 | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8 index e8af65a8c94..85dae6e0857 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.116 2001/04/15 19:41:21 stevesk Exp $ +.\" $OpenBSD: sshd.8,v 1.117 2001/04/15 21:05:49 stevesk Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -683,7 +683,7 @@ and .Dq 2 . Multiple versions must be comma-separated. The default is -.Dq 1 . +.Dq 1,2 . .It Cm PubkeyAuthentication Specifies whether public key authentication is allowed. The default is diff --git a/usr.bin/ssh/sshd_config b/usr.bin/ssh/sshd_config index f9a959edee7..103d574b83a 100644 --- a/usr.bin/ssh/sshd_config +++ b/usr.bin/ssh/sshd_config @@ -1,10 +1,10 @@ -# $OpenBSD: sshd_config,v 1.36 2001/04/12 19:15:26 markus Exp $ +# $OpenBSD: sshd_config,v 1.37 2001/04/15 21:05:49 stevesk Exp $ # This is the sshd server system-wide configuration file. See sshd(8) # for more information. Port 22 -#Protocol 2,1 +#Protocol 2 #ListenAddress 0.0.0.0 #ListenAddress :: HostKey /etc/ssh_host_key |