aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal H. Walfield <[email protected]>2015-06-16 14:13:51 +0000
committerNeal H. Walfield <[email protected]>2015-06-29 13:53:47 +0000
commit60cf69ff9d61a2cd37fc4468f232fd41aa70a651 (patch)
tree5163c52524f4dd0bbe315e58d5737305f0a09690
parentImprove the description of old packets with an indeterminate length. (diff)
downloadgnupg-60cf69ff9d61a2cd37fc4468f232fd41aa70a651.tar.gz
gnupg-60cf69ff9d61a2cd37fc4468f232fd41aa70a651.zip
Don't raise max-cache-ttl to default-cache-ttl.
* agent/gpg-agent.c (finalize_rereadable_options): Don't raise max-cache-ttl to default-cache-ttl. Likewise for max-cache-ttl-ssh and default-cache-ttl-ssh. -- Signed-off-by: Neal H. Walfield <[email protected]> This closes issue #2009.
-rw-r--r--agent/gpg-agent.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index b4fab4e33..4c2f67833 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -677,12 +677,6 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
static void
finalize_rereadable_options (void)
{
- /* It would be too surprising if the max-cache-ttl is lower than the
- default-cache-ttl - thus we silently correct that. */
- if (opt.def_cache_ttl > opt.max_cache_ttl)
- opt.max_cache_ttl = opt.def_cache_ttl;
- if (opt.def_cache_ttl_ssh > opt.max_cache_ttl_ssh)
- opt.max_cache_ttl_ssh = opt.def_cache_ttl_ssh;
}