summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-09-13 04:52:34 +0000
committerDamien Miller <djm@mindrot.org>2019-09-13 14:53:45 +1000
commit7047d5afe3103f0f07966c05b810682d92add359 (patch)
treefb113fecd95e10f9c2b64415d6d96801225b8a7e
parentb36ee3fcb2f1601693b1b7fd60dd6bd96006ea75 (diff)
upstream: clarify that IdentitiesOnly also applies to the default
~/.ssh/id_* keys; bz#3062 OpenBSD-Commit-ID: 604be570e04646f0f4a17026f8b2aada6a585dfa
-rw-r--r--ssh_config.58
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 867c916a..02a87892 100644
--- a/ssh_config.5
+++ b/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