summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-01-04 00:08:02 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-01-04 00:08:02 +0000
commit40ac6ccc6249d504cde2c88df9f90dfcc81f003f (patch)
treedb92e8c451792c5f33712368b4df3c7dff8e1c3b /usr.bin
parent573f387ec119d78734faf0f7bcb79a160ba603b7 (diff)
ipv6 support: mostly gethostbyname->getaddrinfo/getnameinfo, new features:
sshd allows multiple ListenAddress and Port options. note that libwrap is not IPv6-ready. (based on patches from fujiwara@rcac.tdi.co.jp)
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sshd.87
-rw-r--r--usr.bin/ssh/sshd_config3
2 files changed, 8 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index ccdea15097e..a64d5d06a77 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -9,7 +9,7 @@
.\"
.\" Created: Sat Apr 22 21:55:14 1995 ylo
.\"
-.\" $Id: sshd.8,v 1.27 1999/11/22 21:02:39 markus Exp $
+.\" $Id: sshd.8,v 1.28 2000/01/04 00:08:00 markus Exp $
.\"
.Dd September 25, 1999
.Dt SSHD 8
@@ -320,6 +320,10 @@ Specifies what local address
.Nm
should listen on.
The default is to listen to all local addresses.
+Multiple options of this type are permitted.
+Additionally, the
+.Cm Ports
+options must precede this option.
.It Cm LoginGraceTime
The server disconnects after this time if the user has not
successfully logged in. If the value is 0, there is no time limit.
@@ -365,6 +369,7 @@ normally not allowed).
Specifies the port number that
.Nm
listens on. The default is 22.
+Multiple options of this type are permitted.
.It Cm PrintMotd
Specifies whether
.Nm
diff --git a/usr.bin/ssh/sshd_config b/usr.bin/ssh/sshd_config
index 6799088c713..0d403842077 100644
--- a/usr.bin/ssh/sshd_config
+++ b/usr.bin/ssh/sshd_config
@@ -1,7 +1,8 @@
# This is ssh server systemwide configuration file.
Port 22
-ListenAddress 0.0.0.0
+#ListenAddress 0.0.0.0
+#ListenAddress ::
HostKey /etc/ssh_host_key
ServerKeyBits 768
LoginGraceTime 600