summaryrefslogtreecommitdiffstats
path: root/readconf.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-08-11 11:49:57 +0200
committerDamien Miller <djm@mindrot.org>2020-08-27 03:27:01 +0200
commitd0a195c89e26766d3eb8f3e4e2a00ebc98b57795 (patch)
tree4479d2c36da47752ca6b09bfc8dc4a0e6d2af97c /readconf.h
parentupstream: let the "Confirm user presence for key ..." ssh-askpass (diff)
downloadopenssh-d0a195c89e26766d3eb8f3e4e2a00ebc98b57795.tar.xz
openssh-d0a195c89e26766d3eb8f3e4e2a00ebc98b57795.zip
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 'readconf.h')
-rw-r--r--readconf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h
index e143a1082..d6a15550d 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.133 2020/04/03 02:27:12 dtucker Exp $ */
+/* $OpenBSD: readconf.h,v 1.134 2020/08/11 09:49:57 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -97,6 +97,7 @@ typedef struct {
struct sshkey *certificates[SSH_MAX_CERTIFICATE_FILES];
int add_keys_to_agent;
+ int add_keys_to_agent_lifespan;
char *identity_agent; /* Optional path to ssh-agent socket */
/* Local TCP/IP forward requests. */