From 60cf69ff9d61a2cd37fc4468f232fd41aa70a651 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 16 Jun 2015 16:13:51 +0200 Subject: [PATCH] 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 This closes issue #2009. --- agent/gpg-agent.c | 6 ------ 1 file changed, 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; }