summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp-server.813
-rw-r--r--sftp.117
-rw-r--r--ssh.113
-rw-r--r--sshd.813
5 files changed, 50 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 6adcc31b7..7426258f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 [ssh-keygen.1 ssh-keygen.c] 16 [ssh-keygen.1 ssh-keygen.c]
17 rename arguments -x -> -e (export key), -X -> -i (import key) 17 rename arguments -x -> -e (export key), -X -> -i (import key)
18 xref draft-ietf-secsh-publickeyfile-01.txt 18 xref draft-ietf-secsh-publickeyfile-01.txt
19 - markus@cvs.openbsd.org 2001/04/22 13:32:27
20 [sftp-server.8 sftp.1 ssh.1 sshd.8]
21 xref draft-ietf-secsh-*
19 22
2020010421 2320010421
21 - OpenBSD CVS Sync 24 - OpenBSD CVS Sync
@@ -5219,4 +5222,4 @@
5219 - Wrote replacements for strlcpy and mkdtemp 5222 - Wrote replacements for strlcpy and mkdtemp
5220 - Released 1.0pre1 5223 - Released 1.0pre1
5221 5224
5222$Id: ChangeLog,v 1.1157 2001/04/22 17:15:46 mouring Exp $ 5225$Id: ChangeLog,v 1.1158 2001/04/22 17:17:46 mouring Exp $
diff --git a/sftp-server.8 b/sftp-server.8
index 8289adca8..9699cce87 100644
--- a/sftp-server.8
+++ b/sftp-server.8
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp-server.8,v 1.5 2001/03/02 18:54:31 deraadt Exp $ 1.\" $OpenBSD: sftp-server.8,v 1.6 2001/04/22 13:32:26 markus Exp $
2.\" 2.\"
3.\" Copyright (c) 2000 Markus Friedl. All rights reserved. 3.\" Copyright (c) 2000 Markus Friedl. All rights reserved.
4.\" 4.\"
@@ -44,10 +44,17 @@ See
44.Xr sshd 8 44.Xr sshd 8
45for more information. 45for more information.
46.Sh SEE ALSO 46.Sh SEE ALSO
47.Xr sftp 1 ,
47.Xr ssh 1 , 48.Xr ssh 1 ,
48.Xr ssh-add 1 ,
49.Xr ssh-keygen 1 ,
50.Xr sshd 8 49.Xr sshd 8
50.Rs
51.%A T. Ylonen
52.%A S. Lehtinen
53.%T "SSH File Transfer Protocol"
54.%N draft-ietf-secsh-filexfer-00.txt
55.%D January 2001
56.%O work in progress material
57.Re
51.Sh AUTHORS 58.Sh AUTHORS
52Markus Friedl <markus@openbsd.org> 59Markus Friedl <markus@openbsd.org>
53.Sh HISTORY 60.Sh HISTORY
diff --git a/sftp.1 b/sftp.1
index c9a9f9352..b482996ed 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.16 2001/04/21 00:55:57 mouring Exp $ 1.\" $OpenBSD: sftp.1,v 1.17 2001/04/22 13:32:27 markus Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -206,10 +206,17 @@ Synonym for help.
206.Sh AUTHORS 206.Sh AUTHORS
207Damien Miller <djm@mindrot.org> 207Damien Miller <djm@mindrot.org>
208.Sh SEE ALSO 208.Sh SEE ALSO
209.Xr scp 1 ,
209.Xr ssh 1 , 210.Xr ssh 1 ,
210.Xr sftp-server 8 ,
211.Xr ssh-add 1 , 211.Xr ssh-add 1 ,
212.Xr ssh-keygen 1 , 212.Xr ssh-keygen 1 ,
213.Xr sshd 8 , 213.Xr sftp-server 8 ,
214.Xr scp 1 214.Xr sshd 8
215 215.Rs
216.%A T. Ylonen
217.%A S. Lehtinen
218.%T "SSH File Transfer Protocol"
219.%N draft-ietf-secsh-filexfer-00.txt
220.%D January 2001
221.%O work in progress material
222.Re
diff --git a/ssh.1 b/ssh.1
index 1ac3095d7..4757a12d7 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.105 2001/04/22 08:13:30 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.106 2001/04/22 13:32:27 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -1350,3 +1350,14 @@ protocol versions 1.5 and 2.0.
1350.Xr ssh-keygen 1 , 1350.Xr ssh-keygen 1 ,
1351.Xr telnet 1 , 1351.Xr telnet 1 ,
1352.Xr sshd 8 1352.Xr sshd 8
1353.Rs
1354.%A T. Ylonen
1355.%A T. Kivinen
1356.%A M. Saarinen
1357.%A T. Rinne
1358.%A S. Lehtinen
1359.%T "SSH Protocol Architecture"
1360.%N draft-ietf-secsh-architecture-07.txt
1361.%D January 2001
1362.%O work in progress material
1363.Re
diff --git a/sshd.8 b/sshd.8
index f2a529dd5..5b8380dc5 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.118 2001/04/15 21:41:29 deraadt Exp $ 37.\" $OpenBSD: sshd.8,v 1.119 2001/04/22 13:32:27 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -1198,3 +1198,14 @@ protocol versions 1.5 and 2.0.
1198.Xr ssh-keygen 1 , 1198.Xr ssh-keygen 1 ,
1199.Xr rlogin 1 , 1199.Xr rlogin 1 ,
1200.Xr rsh 1 1200.Xr rsh 1
1201.Rs
1202.%A T. Ylonen
1203.%A T. Kivinen
1204.%A M. Saarinen
1205.%A T. Rinne
1206.%A S. Lehtinen
1207.%T "SSH Protocol Architecture"
1208.%N draft-ietf-secsh-architecture-07.txt
1209.%D January 2001
1210.%O work in progress material
1211.Re