diff options
| author | Damien Miller <djm@mindrot.org> | 2011-06-20 14:22:49 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-06-20 14:22:49 +1000 |
| commit | 6029e076b2c58f5a2cb0dce370b1f14912104fcd (patch) | |
| tree | 929c75199a7ff75e3ec612bbe47ed7e9ae359b44 | |
| parent | bc481570d14b6061fe4cb286cec56d555351c28d (diff) | |
| download | openssh-git-6029e076b2c58f5a2cb0dce370b1f14912104fcd.tar.gz | |
- djm@cvs.openbsd.org 2011/06/04 00:10:26
[ssh_config.5]
explain IdentifyFile's semantics a little better, prompted by bz#1898
ok dtucker jmc
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ssh_config.5 | 8 |
2 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,10 @@ +20110620 + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2011/06/04 00:10:26 + [ssh_config.5] + explain IdentifyFile's semantics a little better, prompted by bz#1898 + ok dtucker jmc + 20110603 - (dtucker) [README version.h contrib/caldera/openssh.spec contrib/redhat/openssh.spec contrib/suse/openssh.spec] Pull the version diff --git a/ssh_config.5 b/ssh_config.5 index 87574e38..694ff814 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (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.151 2011/05/24 07:15:47 djm Exp $ -.Dd $Mdocdate: May 24 2011 $ +.\" $OpenBSD: ssh_config.5,v 1.152 2011/06/04 00:10:26 djm Exp $ +.Dd $Mdocdate: June 4 2011 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -648,6 +648,10 @@ escape characters: It is possible to have multiple identity files specified in configuration files; all these identities will be tried in sequence. +Multiple +.Cm IdentityFile +directives will add to the list of identities tried (this behaviour +differs from that of other configuration directives). .It Cm IPQoS Specifies the IPv4 type-of-service or DSCP class for connections. Accepted values are |