diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-08-11 09:49:57 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-08-27 11:27:01 +1000 |
| commit | d0a195c89e26766d3eb8f3e4e2a00ebc98b57795 (patch) | |
| tree | 4479d2c36da47752ca6b09bfc8dc4a0e6d2af97c /ssh_config.5 | |
| parent | e9c2002891a7b8e66f4140557a982978f372e5a3 (diff) | |
| download | openssh-git-d0a195c89e26766d3eb8f3e4e2a00ebc98b57795.tar.gz | |
upstream: let ssh_config(5)'s AddKeysToAgent keyword accept a time
limit for keys in addition to its current flag options. Time-limited keys
will automatically be removed from ssh-agent after their expiry time has
passed; ok markus@
OpenBSD-Commit-ID: 792e71cacbbc25faab5424cf80bee4a006119f94
Diffstat (limited to 'ssh_config.5')
| -rw-r--r-- | ssh_config.5 | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 2b635410..6be1f1aa 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (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.331 2020/07/17 05:59:05 jmc Exp $ -.Dd $Mdocdate: July 17 2020 $ +.\" $OpenBSD: ssh_config.5,v 1.332 2020/08/11 09:49:57 djm Exp $ +.Dd $Mdocdate: August 11 2020 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -245,13 +245,22 @@ option was specified to If this option is set to .Cm no , no keys are added to the agent. +Alternately, this option may be specified as a time interval +using the format described in the +.Sx TIME FORMATS +section of +.Xr sshd_config 5 +to specify the key's lifetime in +.Xr ssh-agent 1 , +after which it will automatically be removed. The argument must be -.Cm yes , -.Cm confirm , -.Cm ask , -or .Cm no -(the default). +(the default), +.Cm yes , +.Cm confirm +(optionally followed by a time interval), +.Cm ask +or a time interval. .It Cm AddressFamily Specifies which address family to use when connecting. Valid arguments are |