diff options
| -rw-r--r-- | tests/ChangeLog | 2 | ||||
| -rw-r--r-- | tests/gpg/t-gpgconf.c | 24 |
2 files changed, 18 insertions, 8 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index d63ca038..89b40b4c 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,7 @@ 2008-01-10 Marcus Brinkmann <[email protected]> + * gpg/t-gpgconf.c (main): Allow for dirmngr not to be available. + * gpg/Makefile.am (./gpg-agent.conf): Correct pinentry path. * gpg/pinentry: New file. diff --git a/tests/gpg/t-gpgconf.c b/tests/gpg/t-gpgconf.c index a619a465..8d9fb200 100644 --- a/tests/gpg/t-gpgconf.c +++ b/tests/gpg/t-gpgconf.c @@ -292,15 +292,23 @@ main (int argc, char **argv) comp = conf; while (comp && strcmp (comp->name, "dirmngr")) comp = comp->next; - opt = comp->options; - while (opt && strcmp (opt->name, "verbose")) - opt = opt->next; - - err = gpgme_conf_opt_change (opt, 0, arg); - fail_if_err (err); - err = gpgme_op_conf_save (ctx, comp); - fail_if_err (err); + if (comp) + { + opt = comp->options; + while (opt && strcmp (opt->name, "verbose")) + opt = opt->next; + + /* Allow for the verbose option not to be there. */ + if (opt) + { + err = gpgme_conf_opt_change (opt, 0, arg); + fail_if_err (err); + + err = gpgme_op_conf_save (ctx, comp); + fail_if_err (err); + } + } } #endif |