diff options
| author | Damien Miller <djm@mindrot.org> | 2010-01-26 12:51:13 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-01-26 12:51:13 +1100 |
| commit | 2e68d793d6967e01faa9ead98b0e527bd19a8d16 (patch) | |
| tree | af5c44527cf30feed8d97bfa8a2b2b85bf2eb68d | |
| parent | 6761c7417d362fb8c0d71ddc60c3914f97e88c28 (diff) | |
| download | openssh-git-2e68d793d6967e01faa9ead98b0e527bd19a8d16.tar.gz | |
- 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ssh-agent.1 | 9 |
2 files changed, 12 insertions, 4 deletions
@@ -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 acc115bd..f65e8e62 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 <ylo@cs.hut.fi> .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: October 22 2009 $ +.Dd $Mdocdate: January 17 2010 $ .Dt SSH-AGENT 1 .Os .Sh NAME @@ -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. |