summaryrefslogtreecommitdiffstats
path: root/tools/gpgconf-comp.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2016-12-16 14:25:47 +0100
committerWerner Koch <wk@gnupg.org>2016-12-16 16:05:02 +0100
commit6ca3c28da46873416822bf6ab7893db6c56a49d6 (patch)
treeb01075c3a8499574f34350822c7e48988b283c9f /tools/gpgconf-comp.c
parentdoc: Mention extra information in pinentry status lines. (diff)
downloadgnupg2-6ca3c28da46873416822bf6ab7893db6c56a49d6.tar.xz
gnupg2-6ca3c28da46873416822bf6ab7893db6c56a49d6.zip
gpgconf: Fix --apply-defaults.
* tools/gpgconf-comp.c: Skip pinentry also in process_all mode. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'tools/gpgconf-comp.c')
-rw-r--r--tools/gpgconf-comp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index cd99c8132..3fddc7c04 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -2286,9 +2286,6 @@ gc_component_retrieve_options (int component)
gc_backend_t backend;
gc_option_t *option;
- if (component == GC_COMPONENT_PINENTRY)
- return; /* Dummy module for now. */
-
for (backend = 0; backend < GC_BACKEND_NR; backend++)
backend_seen[backend] = 0;
@@ -2301,6 +2298,9 @@ gc_component_retrieve_options (int component)
do
{
+ if (component == GC_COMPONENT_PINENTRY)
+ continue; /* Skip this dummy component. */
+
option = gc_component[component].options;
while (option && option->name)