2008-01-10 Marcus Brinkmann <marcus@g10code.de>

* gpg/t-gpgconf.c (main): Allow for dirmngr not to be available.
This commit is contained in:
Marcus Brinkmann 2008-01-10 04:54:16 +00:00
parent ade61e1311
commit 38c5950991
2 changed files with 18 additions and 8 deletions

View File

@ -1,5 +1,7 @@
2008-01-10 Marcus Brinkmann <marcus@g10code.de> 2008-01-10 Marcus Brinkmann <marcus@g10code.de>
* gpg/t-gpgconf.c (main): Allow for dirmngr not to be available.
* gpg/Makefile.am (./gpg-agent.conf): Correct pinentry path. * gpg/Makefile.am (./gpg-agent.conf): Correct pinentry path.
* gpg/pinentry: New file. * gpg/pinentry: New file.

View File

@ -292,16 +292,24 @@ main (int argc, char **argv)
comp = conf; comp = conf;
while (comp && strcmp (comp->name, "dirmngr")) while (comp && strcmp (comp->name, "dirmngr"))
comp = comp->next; comp = comp->next;
if (comp)
{
opt = comp->options; opt = comp->options;
while (opt && strcmp (opt->name, "verbose")) while (opt && strcmp (opt->name, "verbose"))
opt = opt->next; opt = opt->next;
/* Allow for the verbose option not to be there. */
if (opt)
{
err = gpgme_conf_opt_change (opt, 0, arg); err = gpgme_conf_opt_change (opt, 0, arg);
fail_if_err (err); fail_if_err (err);
err = gpgme_op_conf_save (ctx, comp); err = gpgme_op_conf_save (ctx, comp);
fail_if_err (err); fail_if_err (err);
} }
}
}
#endif #endif
gpgme_conf_release (conf); gpgme_conf_release (conf);