summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-05 21:31:11 +1100
committerDamien Miller <djm@mindrot.org>2010-03-05 21:31:11 +1100
commit5059d8d7e647ed6202e3d77f623774919b20eefc (patch)
tree285bb505349fb471abe769549afd67f462ba3596 /ssh.1
parent922b541329285cede860607c877f72663f3d2a9f (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.1')
-rw-r--r--ssh.17
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh.1 b/ssh.1
index c1a408348..3f815b8e7 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
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.1,v 1.301 2010/03/05 08:31:20 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.302 2010/03/05 10:28:21 djm Exp $
38.Dd $Mdocdate: March 5 2010 $ 38.Dd $Mdocdate: March 5 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -306,6 +306,11 @@ It is possible to have multiple
306.Fl i 306.Fl i
307options (and multiple identities specified in 307options (and multiple identities specified in
308configuration files). 308configuration files).
309.Nm
310will also try to load certificate information from the filename obtained
311by appending
312.Pa -cert.pub
313to identity filenames.
309.It Fl K 314.It Fl K
310Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI 315Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI
311credentials to the server. 316credentials to the server.