security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

2007-12-10 Marcus Brinkmann <marcus@g10code.de> 

* gpgconf-comp.c (gc_component_list_options): Fix up expert level
	of group.
This commit is contained in:
Marcus Brinkmann 2007-12-10 16:44:38 +00:00
parent bc482052f8
commit b644408d0d
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/ChangeLog
View File

@ -1,3 +1,8 @@
2007-12-10 Marcus Brinkmann <marcus@g10code.de>
* gpgconf-comp.c (gc_component_list_options): Fix up expert level
of group.
2007-12-04 Marcus Brinkmann <marcus@g10code.de>
* gpgconf-comp.c (gc_component_list_components): Do not print a

34
tools/gpgconf-comp.c
View File

@ -1531,7 +1531,6 @@ void
gc_component_list_options (int component, FILE *out)
{
const gc_option_t *option = gc_component[component].options;
const gc_option_t *group_option = NULL;
while (option && option->name)
{
@ -1544,17 +1543,38 @@ gc_component_list_options (int component, FILE *out)
}
if (option->flags & GC_OPT_FLAG_GROUP)
group_option = option;
else
{
if (group_option)
const gc_option_t *group_option = option + 1;
gc_expert_level_t level = GC_LEVEL_NR;
/* The manual states that the group level is always the
minimum of the levels of all contained options. Due to
different active options, and because it is hard to
maintain manually, we calculate it here. The value in
the global static table is ignored. */
while (group_option->name)
{
list_one_option (group_option, out);
group_option = NULL;
if (group_option->flags & GC_OPT_FLAG_GROUP)
break;
if (group_option->level < level)
level = group_option->level;
group_option++;
}
list_one_option (option, out);
/* Check if group is empty. */
if (level != GC_LEVEL_NR)
{
gc_option_t opt_copy;
/* Fix up the group level. */
memcpy (&opt_copy, option, sizeof (opt));
opt_copy.level = level;
list_one_option (&opt_copy, out);
}
}
else
list_one_option (option, out);
option++;
}