summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2019-09-13 04:52:35 +0000
committerDamien Miller <djm@cvs.openbsd.org>2019-09-13 04:52:35 +0000
commita9179d7c75ad3e6220c16f94c515be7f726b6d8c (patch)
treeb287fd1dac50dade363a02fd1a67ed9aec258bce
parent49bf96bc337df4ed7f92e5eb5d521d791e4faa45 (diff)
clarify that IdentitiesOnly also applies to the default ~/.ssh/id_*
keys; bz#3062
-rw-r--r--usr.bin/ssh/ssh_config.58
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index d5f3201b99b..aea2ec7778e 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.303 2019/09/13 04:27:35 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.304 2019/09/13 04:52:34 djm Exp $
.Dd $Mdocdate: September 13 2019 $
.Dt SSH_CONFIG 5
.Os
@@ -872,13 +872,13 @@ The default is the name given on the command line.
.It Cm IdentitiesOnly
Specifies that
.Xr ssh 1
-should only use the authentication identity and certificate files explicitly
-configured in the
+should only use the configured authentication identity and certificate files
+(either the default files, or those explicitly configured in the
.Nm
files
or passed on the
.Xr ssh 1
-command-line,
+command-line),
even if
.Xr ssh-agent 1
or a