diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-10 20:10:25 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-03-10 20:10:25 +0000 |
| commit | ff4b04e0d6105849f2b141c035ecd92a4ebc6d97 (patch) | |
| tree | 3d2e6235900570f05cfbdbc81f01095fa38bd1e7 /ssh-agent.1 | |
| parent | 4cb2962809c63c51f6f7e029b95f2bdb622f1e4a (diff) | |
| download | src-ff4b04e0d6105849f2b141c035ecd92a4ebc6d97.tar.gz src-ff4b04e0d6105849f2b141c035ecd92a4ebc6d97.zip | |
Vendor import of OpenSSH 7.2p1.vendor/openssh/7.2p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=296619
svn path=/vendor-crypto/openssh/7.2p1/; revision=296620; tag=vendor/openssh/7.2p1
Diffstat (limited to 'ssh-agent.1')
| -rw-r--r-- | ssh-agent.1 | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ssh-agent.1 b/ssh-agent.1 index d0aa712f1c69..c4b50bbdfe74 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-agent.1,v 1.59 2015/04/24 06:26:49 jmc Exp $ +.\" $OpenBSD: ssh-agent.1,v 1.62 2015/11/15 23:54:15 jmc 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: April 24 2015 $ +.Dd $Mdocdate: November 15 2015 $ .Dt SSH-AGENT 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Sh SYNOPSIS .Nm ssh-agent .Op Fl c | s -.Op Fl Dd +.Op Fl \&Dd .Op Fl a Ar bind_address .Op Fl E Ar fingerprint_hash .Op Fl t Ar life @@ -66,6 +66,13 @@ machines using .Pp The agent initially does not have any private keys. Keys are added using +.Xr ssh 1 +(see +.Cm AddKeysToAgent +in +.Xr ssh_config 5 +for details) +or .Xr ssh-add 1 . Multiple identities may be stored in .Nm @@ -130,7 +137,7 @@ overrides this value. Without this option the default maximum lifetime is forever. .El .Pp -If a commandline is given, this is executed as a subprocess of the agent. +If a command line is given, this is executed as a subprocess of the agent. When the command dies, so does the agent. .Pp The idea is that the agent is run in the user's local PC, laptop, or |