- djm@cvs.openbsd.org 2013/06/21 00:37:49

[ssh_config.5]
     explicitly mention that IdentitiesOnly can be used with IdentityFile
     to control which keys are offered from an agent.
This commit is contained in:
Damien Miller 2013-07-18 16:10:29 +10:00
parent 20bdcd7236
commit 7f2b438ca0
2 changed files with 14 additions and 3 deletions

View File

@ -16,6 +16,10 @@
[auth-rsa.c auth.h auth2-hostbased.c auth2-pubkey.c monitor.c] [auth-rsa.c auth.h auth2-hostbased.c auth2-pubkey.c monitor.c]
for hostbased authentication, print the client host and user on for hostbased authentication, print the client host and user on
the auth success/failure line; bz#2064, ok dtucker@ the auth success/failure line; bz#2064, ok dtucker@
- djm@cvs.openbsd.org 2013/06/21 00:37:49
[ssh_config.5]
explicitly mention that IdentitiesOnly can be used with IdentityFile
to control which keys are offered from an agent.
20130702 20130702
- (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config

View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.164 2013/05/16 06:28:45 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.165 2013/06/21 00:37:49 djm Exp $
.Dd $Mdocdate: May 16 2013 $ .Dd $Mdocdate: June 21 2013 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -628,7 +628,9 @@ and
.Pa ~/.ssh/id_rsa .Pa ~/.ssh/id_rsa
for protocol version 2. for protocol version 2.
Additionally, any identities represented by the authentication agent Additionally, any identities represented by the authentication agent
will be used for authentication. will be used for authentication unless
.Cm IdentitiesOnly
is set.
.Xr ssh 1 .Xr ssh 1
will try to load certificate information from the filename obtained by will try to load certificate information from the filename obtained by
appending appending
@ -657,6 +659,11 @@ Multiple
.Cm IdentityFile .Cm IdentityFile
directives will add to the list of identities tried (this behaviour directives will add to the list of identities tried (this behaviour
differs from that of other configuration directives). differs from that of other configuration directives).
.Pp
.Cm IdentityFile
may be used in conjunction with
.Cm IdentitiesOnly
to select which identities in an agent are offered during authentication.
.It Cm IgnoreUnknown .It Cm IgnoreUnknown
Specifies a pattern-list of unknown options to be ignored if they are Specifies a pattern-list of unknown options to be ignored if they are
encountered in configuration parsing. encountered in configuration parsing.