From: deraadt@openbsd.org <deraadt@openbsd.org>
Date: Sat, 3 Oct 2020 02:18:33 +0000 (+0000)
Subject: upstream: split introductory paragraph, and insert ominous words about
X-Git-Tag: V_8_5_P1~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66bd9fdf8b7762eb6a85cabbb1ae4ed955679f60;p=thirdparty%2Fopenssh-portable.git

upstream: split introductory paragraph, and insert ominous words about

the glob issue, which cannot be fully fixed and really requires completely
replacing scp with a completely different subsystem. team effort to find the
right words..

OpenBSD-Commit-ID: 58e1f72d292687f63eb357183036ee242513691c
---

diff --git a/scp.1 b/scp.1
index feb839e9c..9cbc1e0de 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.90 2020/08/03 02:43:41 djm Exp $
+.\" $OpenBSD: scp.1,v 1.91 2020/10/03 02:18:33 deraadt Exp $
 .\"
-.Dd $Mdocdate: August 3 2020 $
+.Dd $Mdocdate: October 3 2020 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -31,11 +31,15 @@
 .Sh DESCRIPTION
 .Nm
 copies files between hosts on a network.
+.Pp
 It uses
 .Xr ssh 1
 for data transfer, and uses the same authentication and provides the
-same security as
-.Xr ssh 1 .
+same security as a login session.
+The scp protocol requires execution of the remote user's shell to perform
+.Xr glob 3
+pattern matching.
+.Pp
 .Nm
 will ask for passwords or passphrases if they are needed for
 authentication.