summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh_config.513
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f8e2c6858..4b8a82591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
16 [auth-rsa.c auth.h auth2-hostbased.c auth2-pubkey.c monitor.c] 16 [auth-rsa.c auth.h auth2-hostbased.c auth2-pubkey.c monitor.c]
17 for hostbased authentication, print the client host and user on 17 for hostbased authentication, print the client host and user on
18 the auth success/failure line; bz#2064, ok dtucker@ 18 the auth success/failure line; bz#2064, ok dtucker@
19 - djm@cvs.openbsd.org 2013/06/21 00:37:49
20 [ssh_config.5]
21 explicitly mention that IdentitiesOnly can be used with IdentityFile
22 to control which keys are offered from an agent.
19 23
2020130702 2420130702
21 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config 25 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
diff --git a/ssh_config.5 b/ssh_config.5
index 003ed68ff..86906a488 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
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.164 2013/05/16 06:28:45 jmc Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.165 2013/06/21 00:37:49 djm Exp $
37.Dd $Mdocdate: May 16 2013 $ 37.Dd $Mdocdate: June 21 2013 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -628,7 +628,9 @@ and
628.Pa ~/.ssh/id_rsa 628.Pa ~/.ssh/id_rsa
629for protocol version 2. 629for protocol version 2.
630Additionally, any identities represented by the authentication agent 630Additionally, any identities represented by the authentication agent
631will be used for authentication. 631will be used for authentication unless
632.Cm IdentitiesOnly
633is set.
632.Xr ssh 1 634.Xr ssh 1
633will try to load certificate information from the filename obtained by 635will try to load certificate information from the filename obtained by
634appending 636appending
@@ -657,6 +659,11 @@ Multiple
657.Cm IdentityFile 659.Cm IdentityFile
658directives will add to the list of identities tried (this behaviour 660directives will add to the list of identities tried (this behaviour
659differs from that of other configuration directives). 661differs from that of other configuration directives).
662.Pp
663.Cm IdentityFile
664may be used in conjunction with
665.Cm IdentitiesOnly
666to select which identities in an agent are offered during authentication.
660.It Cm IgnoreUnknown 667.It Cm IgnoreUnknown
661Specifies a pattern-list of unknown options to be ignored if they are 668Specifies a pattern-list of unknown options to be ignored if they are
662encountered in configuration parsing. 669encountered in configuration parsing.