diff options
| author |   djm <djm@openbsd.org> | 2020-08-11 09:49:57 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-08-11 09:49:57 +0000 |
| commit | 210ec77e177d084f4627f88f7a3aa1cdcfb2bd48 (patch) | |
| tree | 38eb2333cf83a71ac0dd7668932ac9e181b2c613 /usr.bin/ssh/sshconnect.c | |
| parent | let the "Confirm user presence for key ..." ssh-askpass notification (diff) | |
| download | wireguard-openbsd-210ec77e177d084f4627f88f7a3aa1cdcfb2bd48.tar.xz wireguard-openbsd-210ec77e177d084f4627f88f7a3aa1cdcfb2bd48.zip | |
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@
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 3b17241794b..fc37b0dfd6a 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.330 2020/07/17 03:43:42 dtucker Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.331 2020/08/11 09:49:57 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1395,7 +1395,8 @@ maybe_add_key_to_agent(const char *authfile, struct sshkey *private, if (sshkey_is_sk(private)) skprovider = options.sk_provider; if ((r = ssh_add_identity_constrained(auth_sock, private, - comment == NULL ? authfile : comment, 0, + comment == NULL ? authfile : comment, + options.add_keys_to_agent_lifespan, (options.add_keys_to_agent == 3), 0, skprovider)) == 0) debug("identity added to agent: %s", authfile); else |