diff options
| author | Damien Miller <djm@mindrot.org> | 2004-06-17 17:19:03 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2004-06-17 17:19:03 +0200 |
| commit | 23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0 (patch) | |
| tree | a4011718b766af34f837471c2311e6cd044e2c20 /ssh_config.5 | |
| parent | - (djm) OpenBSD CVS Sync (diff) | |
| download | openssh-23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0.tar.xz openssh-23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0.zip | |
- djm@cvs.openbsd.org 2004/06/17 15:10:14
[clientloop.c misc.h readconf.c readpass.c ssh.c ssh_config.5]
Add option for confirmation (ControlMaster=ask) via ssh-askpass before
opening shared connections; ok markus@
Diffstat (limited to '')
| -rw-r--r-- | ssh_config.5 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index bab11d313..3e8c1db06 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -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. .\" -.\" $OpenBSD: ssh_config.5,v 1.36 2004/06/13 15:03:02 djm Exp $ +.\" $OpenBSD: ssh_config.5,v 1.37 2004/06/17 15:10:14 djm Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -273,6 +273,15 @@ set to (the default.) These sessions will reuse the master instance's network connection rather than initiating new ones. +Setting this to +.Dq ask +will cause +.Nm ssh +to listen for control connections, but require confirmation using the +.Ev SSH_ASKPASS +program before they are accepted (see +.Xr ssh-add 1 +for details) .It Cm ControlPath Specify a the path to the control socket used for connection sharing. See |