security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: Make "--list-options show-sig-subpackets=n,m" work again.

Browse Source 
* g10/gpg.c (parse_list_options): Set value for show-sig-subpackets.
--

Fixes-commit: 811cfa34cb3e7166f0cf1f94565504dee21cd9f5
and thus a regression in 2.4.0
This commit is contained in:
Werner Koch 2023-01-31 11:32:41 +01:00
parent d11d3cf85b
commit 5a223303d7
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,6 +1,9 @@
Noteworthy changes in version 2.4.1 (unreleased) Noteworthy changes in version 2.4.1 (unreleased)
------------------------------------------------ ------------------------------------------------
* gpg: Make "--list-options show-sig-subpackets" work again.
Fixes regression in 2.4.0.
Noteworthy changes in version 2.4.0 (2022-12-16) Noteworthy changes in version 2.4.0 (2022-12-16)
------------------------------------------------ ------------------------------------------------

15
g10/gpg.c
View File

@ -2047,6 +2047,8 @@ parse_list_options(char *str)
char *subpackets=""; /* something that isn't NULL */ char *subpackets=""; /* something that isn't NULL */
struct parse_options lopts[]= struct parse_options lopts[]=
{ {
{"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,NULL,
NULL},
{"show-photos",LIST_SHOW_PHOTOS,NULL, {"show-photos",LIST_SHOW_PHOTOS,NULL,
N_("display photo IDs during key listings")}, N_("display photo IDs during key listings")},
{"show-usage",LIST_SHOW_USAGE,NULL, {"show-usage",LIST_SHOW_USAGE,NULL,
@ -2077,20 +2079,25 @@ parse_list_options(char *str)
N_("show preferences")}, N_("show preferences")},
{"show-pref-verbose", LIST_SHOW_PREF_VERBOSE, NULL, {"show-pref-verbose", LIST_SHOW_PREF_VERBOSE, NULL,
N_("show preferences")}, N_("show preferences")},
{"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,NULL,
NULL},
{"show-only-fpr-mbox",LIST_SHOW_ONLY_FPR_MBOX, NULL, {"show-only-fpr-mbox",LIST_SHOW_ONLY_FPR_MBOX, NULL,
NULL}, NULL},
{"sort-sigs", LIST_SORT_SIGS, NULL, {"sort-sigs", LIST_SORT_SIGS, NULL,
NULL}, NULL},
{NULL,0,NULL,NULL} {NULL,0,NULL,NULL}
}; };
int i;
/* C99 allows for non-constant initializers, but we'd like to /* C99 allows for non-constant initializers, but we'd like to
compile everywhere, so fill in the show-sig-subpackets argument compile everywhere, so fill in the show-sig-subpackets argument
here. Note that if the parse_options array changes, we'll have here. Note that if the parse_options array changes, we'll have
to change the subscript here. */ to change the subscript here. We use a loop here in case the
lopts[13].value=&subpackets; list above is reordered. */
for (i=0; lopts[i].name; i++)
if (lopts[i].bit == LIST_SHOW_SIG_SUBPACKETS)
{
lopts[i].value = &subpackets;
break;
}
if(parse_options(str,&opt.list_options,lopts,1)) if(parse_options(str,&opt.list_options,lopts,1))
{ {