security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-22 14:57:02 +01:00
Code Activity

gpgconf: Do not list ignored options and mark forced options as r/o.

Browse Source 
* tools/gpgconf-comp.c (list_one_option): Skip ignored options and set
the no_change flag for forced options.
(retrieve_options_from_program): Put the attributes into the option
table.
--

(cherry picked from commit 42785d7c8a524129d9fe1a5afae553ff73f8e25b)
This commit also marks the end of the back port as requested by
GnuPG-bug-id: 5732
This commit is contained in:
Werner Koch 2021-12-30 10:18:23 +01:00
parent bf284fdf22
commit c69c51bce0
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/gpgconf-comp.c
View File

@ -1316,6 +1316,10 @@ list_one_option (gc_component_id_t component,
unsigned long flags; unsigned long flags;
const char *desc_domain = gc_component[component].desc_domain; const char *desc_domain = gc_component[component].desc_domain;
/* Don't show options with the ignore attribute. */
if (option->attr_ignore && !option->attr_force)
return;
if (option->desc) if (option->desc)
{ {
desc = my_dgettext (desc_domain, option->desc); desc = my_dgettext (desc_domain, option->desc);
@ -1352,6 +1356,7 @@ list_one_option (gc_component_id_t component,
if (option->def_in_desc) flags |= GC_OPT_FLAG_DEF_DESC; if (option->def_in_desc) flags |= GC_OPT_FLAG_DEF_DESC;
if (option->no_arg_desc) flags |= GC_OPT_FLAG_NO_ARG_DESC; if (option->no_arg_desc) flags |= GC_OPT_FLAG_NO_ARG_DESC;
if (option->no_change) flags |= GC_OPT_FLAG_NO_CHANGE; if (option->no_change) flags |= GC_OPT_FLAG_NO_CHANGE;
if (option->attr_force) flags |= GC_OPT_FLAG_NO_CHANGE;
es_fprintf (out, ":%lu", flags); es_fprintf (out, ":%lu", flags);
if (opt.verbose) if (opt.verbose)
{ {
@ -1835,11 +1840,6 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
{ {
char *opt_value; char *opt_value;
if (pargs.r_type & ARGPARSE_OPT_IGNORE)
{
/* log_debug ("ignored\n"); */
continue;
}
if (pargs.r_opt == ARGPARSE_CONFFILE) if (pargs.r_opt == ARGPARSE_CONFFILE)
{ {
/* log_debug ("current conffile='%s'\n", */ /* log_debug ("current conffile='%s'\n", */
@ -1861,8 +1861,18 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
if (!option) if (!option)
continue; /* We don't want to handle this option. */ continue; /* We don't want to handle this option. */
option->attr_ignore = !!(pargs.r_type & ARGPARSE_ATTR_IGNORE); /* Set the force and ignore attributes. The idea is that there
option->attr_force = !!(pargs.r_type & ARGPARSE_ATTR_FORCE); * is no way to clear them again, thus we set them when first
* encountered. */
if ((pargs.r_type & ARGPARSE_ATTR_FORCE))
option->attr_force = 1;
if ((pargs.r_type & ARGPARSE_ATTR_IGNORE))
option->attr_ignore = 1;
/* If an option has been ignored, there is no need to return
* that option with gpgconf --list-options. */
if (option->attr_ignore)
continue;
switch ((pargs.r_type & ARGPARSE_TYPE_MASK)) switch ((pargs.r_type & ARGPARSE_TYPE_MASK))
{ {