diff options
author | Damien Miller <djm@mindrot.org> | 2000-01-14 15:45:46 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-01-14 15:45:46 +1100 |
commit | 34132e54cbd221d17d373fc54f4e3f7b85727f7f (patch) | |
tree | 7c73917b1082ff91786f9e02d25b853bedd1d472 /sshd.8.in | |
parent | 25e4256ad4f453d8a7c1866243ec1984f859b1de (diff) |
- Merged OpenBSD IPv6 patch:
- [sshd.c sshd.8 sshconnect.c ssh.h ssh.c servconf.h servconf.c scp.1]
[scp.c packet.h packet.c login.c log.c canohost.c channels.c]
[hostfile.c sshd_config]
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)
- [ssh.c canohost.c]
more hints (hints.ai_socktype=SOCK_STREAM) for getaddrinfo,
from itojun@
- [channels.c]
listen on _all_ interfaces for X11-Fwd (hints.ai_flags = AI_PASSIVE)
- [packet.h]
allow auth-kerberos for IPv4 only
- [scp.1 sshd.8 servconf.h scp.c]
document -4, -6, and 'ssh -L 2022/::1/22'
- [ssh.c]
'ssh @host' is illegal (null user name), from
karsten@gedankenpolizei.de
- [sshconnect.c]
better error message
- [sshd.c]
allow auth-kerberos for IPv4 only
- Big IPv6 merge:
- Cleanup overrun in sockaddr copying on RHL 6.1
- Replacements for getaddrinfo, getnameinfo, etc based on versions
from patch from KIKUCHI Takahiro <kick@kyoto.wide.ad.jp>
- Replacement for missing structures on systems that lack IPv6
- record_login needed to know about AF_INET6 addresses
- Borrowed more code from OpenBSD: rresvport_af and requisites
Diffstat (limited to 'sshd.8.in')
-rw-r--r-- | sshd.8.in | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -9,7 +9,7 @@ | |||
9 | .\" | 9 | .\" |
10 | .\" Created: Sat Apr 22 21:55:14 1995 ylo | 10 | .\" Created: Sat Apr 22 21:55:14 1995 ylo |
11 | .\" | 11 | .\" |
12 | .\" $Id: sshd.8.in,v 1.1 1999/12/26 22:23:59 damien Exp $ | 12 | .\" $Id: sshd.8.in,v 1.2 2000/01/14 04:45:52 damien Exp $ |
13 | .\" | 13 | .\" |
14 | .Dd September 25, 1999 | 14 | .Dd September 25, 1999 |
15 | .Dt SSHD 8 | 15 | .Dt SSHD 8 |
@@ -19,7 +19,7 @@ | |||
19 | .Nd secure shell daemon | 19 | .Nd secure shell daemon |
20 | .Sh SYNOPSIS | 20 | .Sh SYNOPSIS |
21 | .Nm sshd | 21 | .Nm sshd |
22 | .Op Fl diqQ | 22 | .Op Fl diqQ46 |
23 | .Op Fl b Ar bits | 23 | .Op Fl b Ar bits |
24 | .Op Fl f Ar config_file | 24 | .Op Fl f Ar config_file |
25 | .Op Fl g Ar login_grace_time | 25 | .Op Fl g Ar login_grace_time |
@@ -173,6 +173,14 @@ When this options is specified | |||
173 | assumes the client has sent the given version string | 173 | assumes the client has sent the given version string |
174 | and skips the | 174 | and skips the |
175 | Protocol Version Identification Exchange. | 175 | Protocol Version Identification Exchange. |
176 | .It Fl 4 | ||
177 | Forces | ||
178 | .Nm | ||
179 | to use IPv4 addresses only. | ||
180 | .It Fl 6 | ||
181 | Forces | ||
182 | .Nm | ||
183 | to use IPv6 addresses only. | ||
176 | .El | 184 | .El |
177 | .Sh CONFIGURATION FILE | 185 | .Sh CONFIGURATION FILE |
178 | .Nm | 186 | .Nm |
@@ -320,6 +328,10 @@ Specifies what local address | |||
320 | .Nm | 328 | .Nm |
321 | should listen on. | 329 | should listen on. |
322 | The default is to listen to all local addresses. | 330 | The default is to listen to all local addresses. |
331 | Multiple options of this type are permitted. | ||
332 | Additionally, the | ||
333 | .Cm Ports | ||
334 | options must precede this option. | ||
323 | .It Cm LoginGraceTime | 335 | .It Cm LoginGraceTime |
324 | The server disconnects after this time if the user has not | 336 | The server disconnects after this time if the user has not |
325 | successfully logged in. If the value is 0, there is no time limit. | 337 | successfully logged in. If the value is 0, there is no time limit. |
@@ -365,6 +377,7 @@ normally not allowed). | |||
365 | Specifies the port number that | 377 | Specifies the port number that |
366 | .Nm | 378 | .Nm |
367 | listens on. The default is 22. | 379 | listens on. The default is 22. |
380 | Multiple options of this type are permitted. | ||
368 | .It Cm PrintMotd | 381 | .It Cm PrintMotd |
369 | Specifies whether | 382 | Specifies whether |
370 | .Nm | 383 | .Nm |