diff options
| author | djm <djm> | 2004-06-17 15:19:03 +0000 |
|---|---|---|
| committer | djm <djm> | 2004-06-17 15:19:03 +0000 |
| commit | b35c9a19a2ef5cba6b609102395b7c9e5f9d15bf (patch) | |
| tree | 7e5d7cebae0b1ab658c148e399cf3702b4723589 /ssh_config.5 | |
| parent | d0f78905ae4946b707852fbdbad6a9854e2529de (diff) | |
| download | openssh-b35c9a19a2ef5cba6b609102395b7c9e5f9d15bf.tar.gz | |
- 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 bab11d31..3e8c1db0 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 |