upstream commit

ssh-askpass(1) is the default, overridden by SSH_ASKPASS;
 diff originally from jiri b;
This commit is contained in:
jmc@openbsd.org 2015-03-30 18:28:37 +00:00 committed by Damien Miller
parent 26e0bcf766
commit 78de1673c0
2 changed files with 14 additions and 15 deletions

View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ssh-add.1,v 1.61 2014/12/21 22:27:56 djm Exp $ .\" $OpenBSD: ssh-add.1,v 1.62 2015/03/30 18:28:37 jmc Exp $
.\" .\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi> .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -35,7 +35,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.Dd $Mdocdate: December 21 2014 $ .Dd $Mdocdate: March 30 2015 $
.Dt SSH-ADD 1 .Dt SSH-ADD 1
.Os .Os
.Sh NAME .Sh NAME
@ -88,12 +88,11 @@ The options are as follows:
.It Fl c .It Fl c
Indicates that added identities should be subject to confirmation before Indicates that added identities should be subject to confirmation before
being used for authentication. being used for authentication.
Confirmation is performed by the Confirmation is performed by
.Ev SSH_ASKPASS .Xr ssh-askpass 1 .
program mentioned below. Successful confirmation is signaled by a zero exit status from
Successful confirmation is signaled by a zero exit status from the .Xr ssh-askpass 1 ,
.Ev SSH_ASKPASS rather than text entered into the requester.
program, rather than text entered into the requester.
.It Fl D .It Fl D
Deletes all identities from the agent. Deletes all identities from the agent.
.It Fl d .It Fl d
@ -156,6 +155,8 @@ and
.Ev SSH_ASKPASS .Ev SSH_ASKPASS
are set, it will execute the program specified by are set, it will execute the program specified by
.Ev SSH_ASKPASS .Ev SSH_ASKPASS
(by default
.Dq ssh-askpass )
and open an X11 window to read the passphrase. and open an X11 window to read the passphrase.
This is particularly useful when calling This is particularly useful when calling
.Nm .Nm
@ -197,6 +198,7 @@ is unable to contact the authentication agent.
.Sh SEE ALSO .Sh SEE ALSO
.Xr ssh 1 , .Xr ssh 1 ,
.Xr ssh-agent 1 , .Xr ssh-agent 1 ,
.Xr ssh-askpass 1 ,
.Xr ssh-keygen 1 , .Xr ssh-keygen 1 ,
.Xr sshd 8 .Xr sshd 8
.Sh AUTHORS .Sh AUTHORS

View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.205 2015/02/20 22:17:21 djm Exp $ .\" $OpenBSD: ssh_config.5,v 1.206 2015/03/30 18:28:37 jmc Exp $
.Dd $Mdocdate: February 20 2015 $ .Dd $Mdocdate: March 30 2015 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -484,11 +484,8 @@ if the control socket does not exist, or is not listening.
Setting this to Setting this to
.Dq ask .Dq ask
will cause ssh will cause ssh
to listen for control connections, but require confirmation using the to listen for control connections, but require confirmation using
.Ev SSH_ASKPASS .Xr ssh-askpass 1 .
program before they are accepted (see
.Xr ssh-add 1
for details).
If the If the
.Cm ControlPath .Cm ControlPath
cannot be opened, cannot be opened,