diff options
author | Damien Miller <djm@mindrot.org> | 2010-03-05 21:31:11 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-03-05 21:31:11 +1100 |
commit | 5059d8d7e647ed6202e3d77f623774919b20eefc (patch) | |
tree | 285bb505349fb471abe769549afd67f462ba3596 /ssh_config.5 | |
parent | 922b541329285cede860607c877f72663f3d2a9f (diff) |
- djm@cvs.openbsd.org 2010/03/05 10:28:21
[ssh-add.1 ssh.1 ssh_config.5]
mention loading of certificate files from [private]-cert.pub when
they are present; feedback and ok jmc@
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 7ab5d02fd..8cf02597d 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,8 +34,8 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.128 2010/02/10 23:20:38 markus Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.129 2010/03/05 10:28:21 djm Exp $ |
38 | .Dd $Mdocdate: February 10 2010 $ | 38 | .Dd $Mdocdate: March 5 2010 $ |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -559,6 +559,12 @@ and | |||
559 | for protocol version 2. | 559 | for protocol version 2. |
560 | Additionally, any identities represented by the authentication agent | 560 | Additionally, any identities represented by the authentication agent |
561 | will be used for authentication. | 561 | will be used for authentication. |
562 | .Xr ssh 1 | ||
563 | will try to load certificate information from the filename obtained by | ||
564 | appending | ||
565 | .Pa -cert.pub | ||
566 | to the path of a specified | ||
567 | .Cm IdentityFile . | ||
562 | .Pp | 568 | .Pp |
563 | The file name may use the tilde | 569 | The file name may use the tilde |
564 | syntax to refer to a user's home directory or one of the following | 570 | syntax to refer to a user's home directory or one of the following |