mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-17 00:39:50 +02:00
agent: Make --allow-external-password-cache work.
* agent/call-pinentry.c (start_pinentry): Remove first instance of sending the option. -- That option to tell Pinentry about an external password cache was send twice and the first one unconditionally. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
3d3a58b796
commit
ef0741ac54
|
@ -353,18 +353,6 @@ start_pinentry (ctrl_t ctrl)
|
||||||
return unlock_pinentry (rc);
|
return unlock_pinentry (rc);
|
||||||
|
|
||||||
|
|
||||||
/* Indicate to the pinentry that it may read from an external cache.
|
|
||||||
|
|
||||||
It is essential that the pinentry respect this. If the cached
|
|
||||||
password is not up to date and retry == 1, then, using a version
|
|
||||||
of GPG Agent that doesn't support this, won't issue another pin
|
|
||||||
request and the user won't get a chance to correct the
|
|
||||||
password. */
|
|
||||||
rc = assuan_transact (entry_ctx, "OPTION allow-external-password-cache",
|
|
||||||
NULL, NULL, NULL, NULL, NULL, NULL);
|
|
||||||
if (rc && gpg_err_code (rc) != GPG_ERR_UNKNOWN_OPTION)
|
|
||||||
return unlock_pinentry (rc);
|
|
||||||
|
|
||||||
value = session_env_getenv (ctrl->session_env, "GPG_TTY");
|
value = session_env_getenv (ctrl->session_env, "GPG_TTY");
|
||||||
if (value)
|
if (value)
|
||||||
{
|
{
|
||||||
|
|
|
@ -352,7 +352,6 @@ Allow clients to use the loopback pinentry features; see the option
|
||||||
@option{pinentry-mode} for details.
|
@option{pinentry-mode} for details.
|
||||||
@end ifset
|
@end ifset
|
||||||
|
|
||||||
@ifset gpgtwoone
|
|
||||||
@item --no-allow-external-cache
|
@item --no-allow-external-cache
|
||||||
@opindex no-allow-external-cache
|
@opindex no-allow-external-cache
|
||||||
Tell Pinentry not to enable features which use an external cache for
|
Tell Pinentry not to enable features which use an external cache for
|
||||||
|
@ -363,7 +362,6 @@ credentials with one master password and may have installed a Pinentry
|
||||||
which employs an additional external cache to implement such a policy.
|
which employs an additional external cache to implement such a policy.
|
||||||
By using this option the Pinentry is advised not to make use of such a
|
By using this option the Pinentry is advised not to make use of such a
|
||||||
cache and instead always ask the user for the requested passphrase.
|
cache and instead always ask the user for the requested passphrase.
|
||||||
@end ifset
|
|
||||||
|
|
||||||
@item --ignore-cache-for-signing
|
@item --ignore-cache-for-signing
|
||||||
@opindex ignore-cache-for-signing
|
@opindex ignore-cache-for-signing
|
||||||
|
|
Loading…
Reference in New Issue
Block a user