summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-25 04:32:38 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-25 04:32:38 +0000
commitb710f788f173a80a9a24fa041558087b56bb7fac (patch)
treef2656b367674356296ed8808452f61f3e18f92ce
parent83647ce474c37c8533e2aaf02f7366fbc0602ad9 (diff)
- deraadt@cvs.openbsd.org 2001/06/23 02:33:05
[sftp.1 sftp-server.8 ssh-keygen.1] join .%A entries; most by bk@rt.fm
-rw-r--r--ChangeLog7
-rw-r--r--sftp-server.85
-rw-r--r--sftp.15
-rw-r--r--ssh-keygen.15
4 files changed, 11 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 997b3c9c2..84917fb26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
120010525 120010625
2 - OpenBSD CVS Sync 2 - OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2001/06/21 21:08:25 3 - markus@cvs.openbsd.org 2001/06/21 21:08:25
4 [session.c] 4 [session.c]
@@ -43,6 +43,9 @@
43 *known_hosts2 is obsolete for hostbased authentication and 43 *known_hosts2 is obsolete for hostbased authentication and
44 only used for backward compat. merge ssh1/2 hostkey check 44 only used for backward compat. merge ssh1/2 hostkey check
45 and move it to auth.c 45 and move it to auth.c
46 - deraadt@cvs.openbsd.org 2001/06/23 02:33:05
47 [sftp.1 sftp-server.8 ssh-keygen.1]
48 join .%A entries; most by bk@rt.fm
46 49
4720010622 5020010622
48 - (stevesk) handle systems without pw_expire and pw_change. 51 - (stevesk) handle systems without pw_expire and pw_change.
@@ -5727,4 +5730,4 @@
5727 - Wrote replacements for strlcpy and mkdtemp 5730 - Wrote replacements for strlcpy and mkdtemp
5728 - Released 1.0pre1 5731 - Released 1.0pre1
5729 5732
5730$Id: ChangeLog,v 1.1307 2001/06/25 04:30:16 mouring Exp $ 5733$Id: ChangeLog,v 1.1308 2001/06/25 04:32:38 mouring Exp $
diff --git a/sftp-server.8 b/sftp-server.8
index 9699cce87..f239e3682 100644
--- a/sftp-server.8
+++ b/sftp-server.8
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp-server.8,v 1.6 2001/04/22 13:32:26 markus Exp $ 1.\" $OpenBSD: sftp-server.8,v 1.7 2001/06/23 02:33:04 deraadt Exp $
2.\" 2.\"
3.\" Copyright (c) 2000 Markus Friedl. All rights reserved. 3.\" Copyright (c) 2000 Markus Friedl. All rights reserved.
4.\" 4.\"
@@ -48,8 +48,7 @@ for more information.
48.Xr ssh 1 , 48.Xr ssh 1 ,
49.Xr sshd 8 49.Xr sshd 8
50.Rs 50.Rs
51.%A T. Ylonen 51.%A T. Ylonen and S. Lehtinen
52.%A S. Lehtinen
53.%T "SSH File Transfer Protocol" 52.%T "SSH File Transfer Protocol"
54.%N draft-ietf-secsh-filexfer-00.txt 53.%N draft-ietf-secsh-filexfer-00.txt
55.%D January 2001 54.%D January 2001
diff --git a/sftp.1 b/sftp.1
index 756123628..66293b325 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.18 2001/05/05 13:42:51 stevesk Exp $ 1.\" $OpenBSD: sftp.1,v 1.19 2001/06/23 02:33:04 deraadt Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -213,8 +213,7 @@ Damien Miller <djm@mindrot.org>
213.Xr sftp-server 8 , 213.Xr sftp-server 8 ,
214.Xr sshd 8 214.Xr sshd 8
215.Rs 215.Rs
216.%A T. Ylonen 216.%A T. Ylonen and S. Lehtinen
217.%A S. Lehtinen
218.%T "SSH File Transfer Protocol" 217.%T "SSH File Transfer Protocol"
219.%N draft-ietf-secsh-filexfer-00.txt 218.%N draft-ietf-secsh-filexfer-00.txt
220.%D January 2001 219.%D January 2001
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 0f04af55b..daa9ea7b9 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.43 2001/06/22 21:55:49 markus Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.44 2001/06/23 02:33:05 deraadt Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -271,8 +271,7 @@ protocol versions 1.5 and 2.0.
271.Xr ssh-agent 1 , 271.Xr ssh-agent 1 ,
272.Xr sshd 8 272.Xr sshd 8
273.Rs 273.Rs
274.%A J. Galbraith 274.%A J. Galbraith and R. Thayer
275.%A R. Thayer
276.%T "SECSH Public Key File Format" 275.%T "SECSH Public Key File Format"
277.%N draft-ietf-secsh-publickeyfile-01.txt 276.%N draft-ietf-secsh-publickeyfile-01.txt
278.%D March 2001 277.%D March 2001