security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Fix --check-options

Browse Source
This commit is contained in:
Werner Koch 2010-08-19 11:41:43 +00:00
parent e5c6738629
commit 299cb641e6
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ChangeLog
View File

@ -1,13 +1,17 @@
2010-08-19 Werner Koch <wk@g10code.com>
* gpgconf.c (main): Fix --check-options.
2010-02-11 Marcus Brinkmann <marcus@g10code.de> 2010-02-11 Marcus Brinkmann <marcus@g10code.de>
From 2009-09-23, 2009-11-04, 2009-11-05, 2009-12-08: From 2009-09-23, 2009-11-04, 2009-11-05, 2009-12-08:
* gpg-connect-agent.c (read_and_print_response): Add arg WITHHASH. * gpg-connect-agent.c (read_and_print_response): Add arg WITHHASH.
(getinfo_pid_cb, read_and_print_response) (getinfo_pid_cb, read_and_print_response)
(main): Pass true for WITHHASH for the HELP command. Update to (main): Pass true for WITHHASH for the HELP command. Update to
new Assuan API. Update use of assuan_socket_connect and new Assuan API. Update use of assuan_socket_connect and
assuan_pipe_connect. Convert posix fd to assuan fd. assuan_pipe_connect. Convert posix fd to assuan fd.
2010-01-10 Werner Koch <wk@g10code.com> 2010-01-10 Werner Koch <wk@g10code.com>
* symcryptrun.c (utmp.h): Remove header; it is not used. * symcryptrun.c (utmp.h): Remove header; it is not used.

19
tools/gpgconf.c
View File

@ -226,15 +226,18 @@ main (int argc, char **argv)
putc ('\n', stderr); putc ('\n', stderr);
exit (1); exit (1);
} }
gc_component_retrieve_options (idx); if (cmd == aCheckOptions)
if (gc_process_gpgconf_conf (NULL, 1, 0, NULL))
exit (1);
if (cmd == aListOptions)
gc_component_list_options (idx, get_outfp (&outfp));
else if (cmd == aChangeOptions)
gc_component_change_options (idx, stdin, get_outfp (&outfp));
else
gc_component_check_options (idx, get_outfp (&outfp), NULL); gc_component_check_options (idx, get_outfp (&outfp), NULL);
else
{
gc_component_retrieve_options (idx);
if (gc_process_gpgconf_conf (NULL, 1, 0, NULL))
exit (1);
if (cmd == aListOptions)
gc_component_list_options (idx, get_outfp (&outfp));
else if (cmd == aChangeOptions)
gc_component_change_options (idx, stdin, get_outfp (&outfp));
}
} }
break; break;