diff options
| author | Werner Koch <[email protected]> | 2020-06-24 10:33:26 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-06-24 10:33:26 +0000 |
| commit | 2d8f060679bafed27909a5ad54b7f74a9f8dd51b (patch) | |
| tree | 0172fe4c7192bb2b3a13e9f26705b4494155f1a5 | |
| parent | agent: expose shadow key type (diff) | |
| download | gnupg-2d8f060679bafed27909a5ad54b7f74a9f8dd51b.tar.gz gnupg-2d8f060679bafed27909a5ad54b7f74a9f8dd51b.zip | |
gpgconf: Fix regression in --launch and --kill from March
* tools/gpgconf.h (gc_component_id_t): Align order with gc_component
array.
--
Fixes-commit: b4f1159a5bd7b2799d7d35e883e0632ebf3339c8
gpgconf: Rewrite the gpgconf-comp module
from 2020-03-12
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | tools/gpgconf-comp.c | 4 | ||||
| -rw-r--r-- | tools/gpgconf.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 8e546e0e5..c905bd13a 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -596,6 +596,10 @@ static struct } gc_component[GC_COMPONENT_NR] = { + /* Note: The order of the items must match the order given in the + * gc_component_id_t enumeration. The order is often used by + * frontends to display the backend options thus do not change the + * order without considering the user experience. */ { NULL }, /* DUMMY for GC_COMPONENT_ANY */ { GPG_NAME, GPG_DISP_NAME, "gnupg", N_("OpenPGP"), diff --git a/tools/gpgconf.h b/tools/gpgconf.h index 6494a2069..83aee9a09 100644 --- a/tools/gpgconf.h +++ b/tools/gpgconf.h @@ -55,15 +55,15 @@ typedef enum /* The classic GPG for OpenPGP. */ GC_COMPONENT_GPG, + /* GPG for S/MIME. */ + GC_COMPONENT_GPGSM, + /* The GPG Agent. */ GC_COMPONENT_GPG_AGENT, /* The Smardcard Daemon. */ GC_COMPONENT_SCDAEMON, - /* GPG for S/MIME. */ - GC_COMPONENT_GPGSM, - /* The LDAP Directory Manager for CRLs. */ GC_COMPONENT_DIRMNGR, |