diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-07-19 09:15:13 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-07-19 09:15:13 +0000 |
| commit | eed12aff26a1a3ce1c453a98be9d86173f39ebbf (patch) | |
| tree | c1e18a2e9c3469dbe2efb889c678c5d41d72b20c /usr.bin/ssh/readconf.h | |
| parent | a8c883e9825f1cb7dfe957cf04668a0d2f53b174 (diff) | |
add a "ControlPersist" option that automatically starts a background
ssh(1) multiplex master when connecting. This connection can stay alive
indefinitely, or can be set to automatically close after a user-specified
duration of inactivity. bz#1330 - patch by dwmw2 AT infradead.org, but
further hacked on by wmertens AT cisco.com, apb AT cequrux.com,
martin-mindrot-bugzilla AT earth.li and myself; "looks ok" markus@
Diffstat (limited to 'usr.bin/ssh/readconf.h')
| -rw-r--r-- | usr.bin/ssh/readconf.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/readconf.h b/usr.bin/ssh/readconf.h index 66acafdefa1..95d10467472 100644 --- a/usr.bin/ssh/readconf.h +++ b/usr.bin/ssh/readconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.85 2010/06/25 23:15:36 djm Exp $ */ +/* $OpenBSD: readconf.h,v 1.86 2010/07/19 09:15:12 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -114,6 +114,8 @@ typedef struct { char *control_path; int control_master; + int control_persist; /* ControlPersist flag */ + int control_persist_timeout; /* ControlPersist timeout (seconds) */ int hash_known_hosts; |