From 74c7ab5fa636c7721dd7529d5bbfce70a47e5550 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 24 Jun 2014 13:46:52 +0200 Subject: [PATCH] doc: Add note regarding gpg-preset-passphrase and --max-cache-ttl. -- GnuPG-bug-id: 1615 --- doc/gpg-agent.texi | 11 +++++++---- doc/tools.texi | 9 +++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index bfb1d9353..c3dfd82b7 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -372,13 +372,16 @@ seconds. The default is 1800 seconds. @opindex max-cache-ttl Set the maximum time a cache entry is valid to @var{n} seconds. After this time a cache entry will be expired even if it has been accessed -recently. The default is 2 hours (7200 seconds). +recently or has been set using @command{gpg-preset-passphrase}. The +default is 2 hours (7200 seconds). @item --max-cache-ttl-ssh @var{n} @opindex max-cache-ttl-ssh -Set the maximum time a cache entry used for SSH keys is valid to @var{n} -seconds. After this time a cache entry will be expired even if it has -been accessed recently. The default is 2 hours (7200 seconds). +Set the maximum time a cache entry used for SSH keys is valid to +@var{n} seconds. After this time a cache entry will be expired even +if it has been accessed recently or has been set using +@command{gpg-preset-passphrase}. The default is 2 hours (7200 +seconds). @item --enforce-passphrase-constraints @opindex enforce-passphrase-constraints diff --git a/doc/tools.texi b/doc/tools.texi index 32ab1e4f8..030f269d0 100644 --- a/doc/tools.texi +++ b/doc/tools.texi @@ -1060,10 +1060,11 @@ may not be used and the passphrases for the to be used keys are given at machine startup. Passphrases set with this utility don't expire unless the -@option{--forget} option is used to explicitly clear them from the cache ---- or @command{gpg-agent} is either restarted or reloaded (by sending a -SIGHUP to it). It is necessary to allow this passphrase presetting by -starting @command{gpg-agent} with the +@option{--forget} option is used to explicitly clear them from the +cache --- or @command{gpg-agent} is either restarted or reloaded (by +sending a SIGHUP to it). Nite that the maximum cache time as set with +@option{--max-cache-ttl} is still honored. It is necessary to allow +this passphrase presetting by starting @command{gpg-agent} with the @option{--allow-preset-passphrase}. @menu