summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ssh-add.17
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cad1660..9f383555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20031209
+ - (dtucker) OpenBSD CVS Sync
+ - 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@.
+
20031208
- (tim) [configure.ac] Bug 770. Fix --without-rpath.
@@ -1535,4 +1541,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3131 2003/12/08 20:35:59 tim Exp $
+$Id: ChangeLog,v 1.3132 2003/12/09 08:01:51 dtucker Exp $
diff --git a/ssh-add.1 b/ssh-add.1
index fe019085..6348197b 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-add.1,v 1.39 2003/06/10 09:12:11 jmc Exp $
+.\" $OpenBSD: ssh-add.1,v 1.40 2003/11/25 23:10:08 matthieu Exp $
.\"
.\" -*- nroff -*-
.\"
@@ -69,8 +69,9 @@ The passphrase is read from the user's tty.
.Nm
retries the last passphrase if multiple identity files are given.
.Pp
-The authentication agent must be running and must be an ancestor of
-the current process for
+The authentication agent must be running and the
+.Ev SSH_AUTH_SOCK
+environment variable must contain the name of its socket for
.Nm
to work.
.Pp