summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh-add.118
-rw-r--r--ssh_config.511
2 files changed, 14 insertions, 15 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index 926456f0b..f02b595d5 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.61 2014/12/21 22:27:56 djm Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.62 2015/03/30 18:28:37 jmc Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: December 21 2014 $ 38.Dd $Mdocdate: March 30 2015 $
39.Dt SSH-ADD 1 39.Dt SSH-ADD 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -88,12 +88,11 @@ The options are as follows:
88.It Fl c 88.It Fl c
89Indicates that added identities should be subject to confirmation before 89Indicates that added identities should be subject to confirmation before
90being used for authentication. 90being used for authentication.
91Confirmation is performed by the 91Confirmation is performed by
92.Ev SSH_ASKPASS 92.Xr ssh-askpass 1 .
93program mentioned below. 93Successful confirmation is signaled by a zero exit status from
94Successful confirmation is signaled by a zero exit status from the 94.Xr ssh-askpass 1 ,
95.Ev SSH_ASKPASS 95rather than text entered into the requester.
96program, rather than text entered into the requester.
97.It Fl D 96.It Fl D
98Deletes all identities from the agent. 97Deletes all identities from the agent.
99.It Fl d 98.It Fl d
@@ -156,6 +155,8 @@ and
156.Ev SSH_ASKPASS 155.Ev SSH_ASKPASS
157are set, it will execute the program specified by 156are set, it will execute the program specified by
158.Ev SSH_ASKPASS 157.Ev SSH_ASKPASS
158(by default
159.Dq ssh-askpass )
159and open an X11 window to read the passphrase. 160and open an X11 window to read the passphrase.
160This is particularly useful when calling 161This is particularly useful when calling
161.Nm 162.Nm
@@ -197,6 +198,7 @@ is unable to contact the authentication agent.
197.Sh SEE ALSO 198.Sh SEE ALSO
198.Xr ssh 1 , 199.Xr ssh 1 ,
199.Xr ssh-agent 1 , 200.Xr ssh-agent 1 ,
201.Xr ssh-askpass 1 ,
200.Xr ssh-keygen 1 , 202.Xr ssh-keygen 1 ,
201.Xr sshd 8 203.Xr sshd 8
202.Sh AUTHORS 204.Sh AUTHORS
diff --git a/ssh_config.5 b/ssh_config.5
index 140d0ba98..22082049a 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.205 2015/02/20 22:17:21 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.206 2015/03/30 18:28:37 jmc Exp $
37.Dd $Mdocdate: February 20 2015 $ 37.Dd $Mdocdate: March 30 2015 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -484,11 +484,8 @@ if the control socket does not exist, or is not listening.
484Setting this to 484Setting this to
485.Dq ask 485.Dq ask
486will cause ssh 486will cause ssh
487to listen for control connections, but require confirmation using the 487to listen for control connections, but require confirmation using
488.Ev SSH_ASKPASS 488.Xr ssh-askpass 1 .
489program before they are accepted (see
490.Xr ssh-add 1
491for details).
492If the 489If the
493.Cm ControlPath 490.Cm ControlPath
494cannot be opened, 491cannot be opened,