diff options
author | Damien Miller <djm@mindrot.org> | 2004-06-18 01:19:03 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-06-18 01:19:03 +1000 |
commit | 23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0 (patch) | |
tree | a4011718b766af34f837471c2311e6cd044e2c20 /ssh_config.5 | |
parent | 3756dcee244f47c20a6590129d99e625169836c6 (diff) |
- 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 'ssh_config.5')
-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 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.36 2004/06/13 15:03:02 djm Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.37 2004/06/17 15:10:14 djm Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -273,6 +273,15 @@ set to | |||
273 | (the default.) | 273 | (the default.) |
274 | These sessions will reuse the master instance's network connection rather | 274 | These sessions will reuse the master instance's network connection rather |
275 | than initiating new ones. | 275 | than initiating new ones. |
276 | Setting this to | ||
277 | .Dq ask | ||
278 | will cause | ||
279 | .Nm ssh | ||
280 | to listen for control connections, but require confirmation using the | ||
281 | .Ev SSH_ASKPASS | ||
282 | program before they are accepted (see | ||
283 | .Xr ssh-add 1 | ||
284 | for details) | ||
276 | .It Cm ControlPath | 285 | .It Cm ControlPath |
277 | Specify a the path to the control socket used for connection sharing. | 286 | Specify a the path to the control socket used for connection sharing. |
278 | See | 287 | See |