summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-12-09 19:01:51 +1100
committerDarren Tucker <dtucker@zip.com.au>2003-12-09 19:01:51 +1100
commit4c56843e44a7dfa10bce91a2440eaac0d918124e (patch)
treefd19474921fcf80e2467923caa153bf1158594ef
parent88368a3034f3fff742c3a4c79b873e2cb6a4c1bb (diff)
- matthieu@cvs.openbsd.org 2003/11/25 23:10:08
[ssh-add.1] ssh-add doesn't need to be a descendant of ssh-agent. Ok markus@, jmc@.
-rw-r--r--ChangeLog8
-rw-r--r--ssh-add.17
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cad1660c..9f3835558 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120031209
2 - (dtucker) OpenBSD CVS Sync
3 - matthieu@cvs.openbsd.org 2003/11/25 23:10:08
4 [ssh-add.1]
5 ssh-add doesn't need to be a descendant of ssh-agent. Ok markus@, jmc@.
6
120031208 720031208
2 - (tim) [configure.ac] Bug 770. Fix --without-rpath. 8 - (tim) [configure.ac] Bug 770. Fix --without-rpath.
3 9
@@ -1535,4 +1541,4 @@
1535 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1541 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1536 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1542 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1537 1543
1538$Id: ChangeLog,v 1.3131 2003/12/08 20:35:59 tim Exp $ 1544$Id: ChangeLog,v 1.3132 2003/12/09 08:01:51 dtucker Exp $
diff --git a/ssh-add.1 b/ssh-add.1
index fe0190859..6348197b3 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.39 2003/06/10 09:12:11 jmc Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.40 2003/11/25 23:10:08 matthieu Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -69,8 +69,9 @@ The passphrase is read from the user's tty.
69.Nm 69.Nm
70retries the last passphrase if multiple identity files are given. 70retries the last passphrase if multiple identity files are given.
71.Pp 71.Pp
72The authentication agent must be running and must be an ancestor of 72The authentication agent must be running and the
73the current process for 73.Ev SSH_AUTH_SOCK
74environment variable must contain the name of its socket for
74.Nm 75.Nm
75to work. 76to work.
76.Pp 77.Pp