diff options
| author | Werner Koch <[email protected]> | 2020-03-14 17:53:43 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-03-14 18:12:41 +0000 |
| commit | 451cd1b3928172b312ca2597c3318e6e9e8be97d (patch) | |
| tree | 3f8b8aa7052753d26a585e71a5861a35786e5ebc /common/gc-opt-flags.h | |
| parent | gpg: New option --auto-key-import (diff) | |
| download | gnupg-451cd1b3928172b312ca2597c3318e6e9e8be97d.tar.gz gnupg-451cd1b3928172b312ca2597c3318e6e9e8be97d.zip | |
gpgconf: Further simplify the gpgconf option processing.
* common/gc-opt-flags.h (GC_OPT_FLAG_RUNTIME): Move to ...
* tools/gpgconf-comp.c: here.
(known_options_scdaemon): Remove "options".
(known_options_dirmngr): Remove "options".
(known_options_gpgsm): Remove "options".
(known_options_gpg): Remove "options" and "keyserver".
(struct gc_option_s): Rename active t gpgconf_list.
(gc_component_list_options): Do not act upon active.
(option_check_validity): Ditto.
(is_known_option): Make it work correctly for unknown options.
(retrieve_options_from_program): Use renamed flag gpgconf_list only to
detect duplicated items from --gpgconf-list. Do not set runtime.
Only e set the options if set by --gpgconf-list; never clear them.
* agent/gpg-agent.c: Simplify the --gpgconf-list output.
* dirmngr/dirmngr.c: Ditto.
* g10/gpg.c: Ditto.
* kbx/keyboxd.c: Ditto.
* scd/scdaemon.c: Ditto.
* sm/gpgsm.c: Ditto.
* tests/openpgp/gpgconf.scm: Use "compliance" instead of "keyserver"
for the string arg test.
--
There is no need to read the list of options from the components
unless they convey a default value. It is better to consult only the
list we have in gpgconf-comp.c to decide on whether an option should
be displayed. Right, this might mess up thing if a newer gpgconf
version is used with an older component, but we already print warnings
in this case and in general we do not want to support this anymore -
the times of gpg 1.4. and 2.0 are long over now.
GnuPG-bug-id: 4788
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'common/gc-opt-flags.h')
| -rw-r--r-- | common/gc-opt-flags.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/common/gc-opt-flags.h b/common/gc-opt-flags.h index 11ecec030..8458aa04f 100644 --- a/common/gc-opt-flags.h +++ b/common/gc-opt-flags.h @@ -20,10 +20,6 @@ #define GC_OPT_FLAG_NONE 0UL -/* The RUNTIME flag for an option indicates that the option can be - changed at runtime. */ -#define GC_OPT_FLAG_RUNTIME (1UL << 3) - /* The DEFAULT flag for an option indicates that the option has a default value. */ #define GC_OPT_FLAG_DEFAULT (1UL << 4) |