diff options
| author | NIIBE Yutaka <[email protected]> | 2017-10-26 05:40:38 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-10-26 05:40:38 +0000 |
| commit | 3b66a256e3760e88066ca11b7b49d924e42aa46b (patch) | |
| tree | 85e4ee80b548cdd9fc1783bd26f009dd3efdc120 /agent/agent.h | |
| parent | agent, tests: Support --disable-scdaemon build case. (diff) | |
| download | gnupg-3b66a256e3760e88066ca11b7b49d924e42aa46b.tar.gz gnupg-3b66a256e3760e88066ca11b7b49d924e42aa46b.zip | |
agent: Allow recursive use of pinentry.
* agent/agent.h (struct server_control_s): Add pinentry_level.
* agent/call-pinentry.c (agent_popup_message_stop): Not clear
ENTRY_CTX here.
(unlock_pinentry): Handle recursion. Clear ENTRY_CTX here.
(start_pinentry): Allow recursive use.
--
GnuPG-bug-id: 3190
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/agent.h')
| -rw-r--r-- | agent/agent.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/agent/agent.h b/agent/agent.h index af64f335e..78a3764cb 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -255,6 +255,9 @@ struct server_control_s /* The current S2K which might be different from the calibrated count. */ unsigned long s2k_count; + + /* Recursion level of pinentry. */ + int pinentry_level; }; |