summaryrefslogtreecommitdiff
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 867c916a7..02a87892d 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.303 2019/09/13 04:27:35 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.304 2019/09/13 04:52:34 djm Exp $
37.Dd $Mdocdate: September 13 2019 $ 37.Dd $Mdocdate: September 13 2019 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
@@ -872,13 +872,13 @@ The default is the name given on the command line.
872.It Cm IdentitiesOnly 872.It Cm IdentitiesOnly
873Specifies that 873Specifies that
874.Xr ssh 1 874.Xr ssh 1
875should only use the authentication identity and certificate files explicitly 875should only use the configured authentication identity and certificate files
876configured in the 876(either the default files, or those explicitly configured in the
877.Nm 877.Nm
878files 878files
879or passed on the 879or passed on the
880.Xr ssh 1 880.Xr ssh 1
881command-line, 881command-line),
882even if 882even if
883.Xr ssh-agent 1 883.Xr ssh-agent 1
884or a 884or a