From 64dace2d2739fb7aaa036f0fad0060c75e74ddfb Mon Sep 17 00:00:00 2001 From: djm Date: Tue, 26 Jan 2010 01:51:13 +0000 Subject: [PATCH] - tedu@cvs.openbsd.org 2010/01/17 21:49:09 [ssh-agent.1] Correct and clarify ssh-add's password asking behavior. Improved text dtucker and ok jmc --- ChangeLog | 7 +++++++ ssh-agent.1 | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e43b42e2..569a2d0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +20100126 + - (djm) OpenBSD CVS Sync + - tedu@cvs.openbsd.org 2010/01/17 21:49:09 + [ssh-agent.1] + Correct and clarify ssh-add's password asking behavior. + Improved text dtucker and ok jmc + 20100122 - (tim) [configure.ac] Due to constraints in Windows Sockets in terms of socket inheritance, reduce the default SO_RCVBUF/SO_SNDBUF buffer size diff --git a/ssh-agent.1 b/ssh-agent.1 index a95087da..8d1da46e 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-agent.1,v 1.49 2009/10/22 15:02:12 sobrado Exp $ +.\" $OpenBSD: ssh-agent.1,v 1.50 2010/01/17 21:49:09 tedu Exp $ .\" .\" Author: Tatu Ylonen .\" Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -119,8 +119,9 @@ and .Pa ~/.ssh/identity . If the identity has a passphrase, .Xr ssh-add 1 -asks for the passphrase (using a small X11 application if running -under X11, or from the terminal if running without X). +asks for the passphrase on the terminal if it has one or from a small X11 +program if running under X11. +If neither of these is the case then the authentication will fail. It then sends the identity to the agent. Several identities can be stored in the agent; the agent can automatically use any of these identities. -- 2.45.1