1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

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 <neal@g10code.com>

This closes issue #2009.
This commit is contained in:
Neal H. Walfield 2015-06-16 16:13:51 +02:00
parent 68c217f457
commit 60cf69ff9d

View File

@ -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;
}