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 /scp.1.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 'scp.1.in')
-rw-r--r-- | scp.1.in | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -9,7 +9,7 @@ | |||
9 | .\" | 9 | .\" |
10 | .\" Created: Sun May 7 00:14:37 1995 ylo | 10 | .\" Created: Sun May 7 00:14:37 1995 ylo |
11 | .\" | 11 | .\" |
12 | .\" $Id: scp.1.in,v 1.1 1999/12/26 22:23:58 damien Exp $ | 12 | .\" $Id: scp.1.in,v 1.2 2000/01/14 04:45:51 damien Exp $ |
13 | .\" | 13 | .\" |
14 | .Dd September 25, 1999 | 14 | .Dd September 25, 1999 |
15 | .Dt SCP 1 | 15 | .Dt SCP 1 |
@@ -19,7 +19,7 @@ | |||
19 | .Nd secure copy (remote file copy program) | 19 | .Nd secure copy (remote file copy program) |
20 | .Sh SYNOPSIS | 20 | .Sh SYNOPSIS |
21 | .Nm scp | 21 | .Nm scp |
22 | .Op Fl pqrvC | 22 | .Op Fl pqrvC46 |
23 | .Op Fl P Ar port | 23 | .Op Fl P Ar port |
24 | .Op Fl c Ar cipher | 24 | .Op Fl c Ar cipher |
25 | .Op Fl i Ar identity_file | 25 | .Op Fl i Ar identity_file |
@@ -93,6 +93,14 @@ because | |||
93 | .Fl p | 93 | .Fl p |
94 | is already reserved for preserving the times and modes of the file in | 94 | is already reserved for preserving the times and modes of the file in |
95 | .Xr rcp 1 . | 95 | .Xr rcp 1 . |
96 | .It Fl 4 | ||
97 | Forces | ||
98 | .Nm | ||
99 | to use IPv4 addresses only. | ||
100 | .It Fl 6 | ||
101 | Forces | ||
102 | .Nm | ||
103 | to use IPv6 addresses only. | ||
96 | .Sh AUTHORS | 104 | .Sh AUTHORS |
97 | Timo Rinne <tri@iki.fi> and Tatu Ylonen <ylo@cs.hut.fi> | 105 | Timo Rinne <tri@iki.fi> and Tatu Ylonen <ylo@cs.hut.fi> |
98 | .Sh HISTORY | 106 | .Sh HISTORY |