- jmc@cvs.openbsd.org 2013/08/14 08:39:27

[scp.1 ssh.1]
     some Bx/Ox conversion;
     From: Jan Stary
This commit is contained in:
Damien Miller 2013-08-21 02:43:49 +10:00
parent d5d9d7b1fd
commit b7727df37e
3 changed files with 16 additions and 8 deletions

View File

@ -46,6 +46,10 @@
- djm@cvs.openbsd.org 2013/08/13 18:33:08 - djm@cvs.openbsd.org 2013/08/13 18:33:08
[ssh-keygen.c] [ssh-keygen.c]
another of the same typo another of the same typo
- jmc@cvs.openbsd.org 2013/08/14 08:39:27
[scp.1 ssh.1]
some Bx/Ox conversion;
From: Jan Stary
20130808 20130808
- (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt

9
scp.1
View File

@ -8,9 +8,9 @@
.\" .\"
.\" Created: Sun May 7 00:14:37 1995 ylo .\" Created: Sun May 7 00:14:37 1995 ylo
.\" .\"
.\" $OpenBSD: scp.1,v 1.59 2013/07/16 00:07:52 schwarze Exp $ .\" $OpenBSD: scp.1,v 1.60 2013/08/14 08:39:27 jmc Exp $
.\" .\"
.Dd $Mdocdate: July 16 2013 $ .Dd $Mdocdate: August 14 2013 $
.Dt SCP 1 .Dt SCP 1
.Os .Os
.Sh NAME .Sh NAME
@ -232,8 +232,9 @@ debugging connection, authentication, and configuration problems.
.Nm .Nm
is based on the is based on the
.Xr rcp 1 .Xr rcp 1
program in BSD source code from the Regents of the University of program in
California. .Bx
source code from the Regents of the University of California.
.Sh AUTHORS .Sh AUTHORS
.An Timo Rinne Aq Mt tri@iki.fi .An Timo Rinne Aq Mt tri@iki.fi
.An Tatu Ylonen Aq Mt ylo@cs.hut.fi .An Tatu Ylonen Aq Mt ylo@cs.hut.fi

11
ssh.1
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh.1,v 1.334 2013/07/18 01:12:26 djm Exp $ .\" $OpenBSD: ssh.1,v 1.335 2013/08/14 08:39:27 jmc Exp $
.Dd $Mdocdate: July 18 2013 $ .Dd $Mdocdate: August 14 2013 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -827,9 +827,12 @@ text, and prompts for a response.
Protocol 2 allows multiple challenges and responses; Protocol 2 allows multiple challenges and responses;
protocol 1 is restricted to just one challenge/response. protocol 1 is restricted to just one challenge/response.
Examples of challenge-response authentication include Examples of challenge-response authentication include
BSD Authentication (see .Bx
Authentication (see
.Xr login.conf 5 ) .Xr login.conf 5 )
and PAM (some non-OpenBSD systems). and PAM (some
.Pf non- Ox
systems).
.Pp .Pp
Finally, if other authentication methods fail, Finally, if other authentication methods fail,
.Nm .Nm