summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-agent.1
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2015-04-24 05:26:44 +0000
committerdjm <djm@openbsd.org>2015-04-24 05:26:44 +0000
commit2ff6bdae5d70e396ecaeb25c121cb59652ab2834 (patch)
tree8ef0a34e2b734491b17a7ae9abb6c3705a20a1f4 /usr.bin/ssh/ssh-agent.1
parentUse "softintr_pic0" instead of "softintr_fakepic" when faking a (diff)
downloadwireguard-openbsd-2ff6bdae5d70e396ecaeb25c121cb59652ab2834.tar.xz
wireguard-openbsd-2ff6bdae5d70e396ecaeb25c121cb59652ab2834.zip
add ssh-agent -D to leave ssh-agent in foreground without enabling
debug mode; bz#2381 ok dtucker@
Diffstat (limited to 'usr.bin/ssh/ssh-agent.1')
-rw-r--r--usr.bin/ssh/ssh-agent.112
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-agent.1 b/usr.bin/ssh/ssh-agent.1
index 6759afec322..adfb51ccb18 100644
--- a/usr.bin/ssh/ssh-agent.1
+++ b/usr.bin/ssh/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.57 2014/12/21 22:27:56 djm Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.58 2015/04/24 05:26:44 djm 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: December 21 2014 $
+.Dd $Mdocdate: April 24 2015 $
.Dt SSH-AGENT 1
.Os
.Sh NAME
@@ -43,6 +43,7 @@
.Sh SYNOPSIS
.Nm ssh-agent
.Op Fl c | s
+.Op Fl D
.Op Fl d
.Op Fl a Ar bind_address
.Op Fl E Ar fingerprint_hash
@@ -92,11 +93,16 @@ Generate C-shell commands on
This is the default if
.Ev SHELL
looks like it's a csh style of shell.
+.It Fl D
+Foreground mode.
+When this option is specified
+.Nm
+will not fork.
.It Fl d
Debug mode.
When this option is specified
.Nm
-will not fork.
+will not fork and will write debug information to standard error.
.It Fl E Ar fingerprint_hash
Specifies the hash algorithm used when displaying key fingerprints.
Valid options are: