mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-09 21:28:51 +01:00
451cd1b392
* 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 <wk@gnupg.org>
43 lines
1.6 KiB
C
43 lines
1.6 KiB
C
/* gc-opt-flags.h - gpgconf constants used by the backends.
|
|
* Copyright (C) 2004, 2007 Free Software Foundation, Inc.
|
|
*
|
|
* This file is free software; as a special exception the author gives
|
|
* unlimited permission to copy and/or distribute it, with or without
|
|
* modifications, as long as this notice is preserved.
|
|
*
|
|
* This file is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY, to the extent permitted by law; without even
|
|
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
* PURPOSE.
|
|
*/
|
|
|
|
#ifndef GNUPG_GC_OPT_FLAGS_H
|
|
#define GNUPG_GC_OPT_FLAGS_H
|
|
|
|
/* Public option flags. YOU MUST NOT CHANGE THE NUMBERS OF THE
|
|
EXISTING FLAGS, AS THEY ARE PART OF THE EXTERNAL INTERFACE. See
|
|
gnupg/tools/gpgconf-comp.c for details. */
|
|
|
|
#define GC_OPT_FLAG_NONE 0UL
|
|
|
|
/* The DEFAULT flag for an option indicates that the option has a
|
|
default value. */
|
|
#define GC_OPT_FLAG_DEFAULT (1UL << 4)
|
|
|
|
/* The DEF_DESC flag for an option indicates that the option has a
|
|
default, which is described by the value of the default field. */
|
|
#define GC_OPT_FLAG_DEF_DESC (1UL << 5)
|
|
|
|
/* The NO_ARG_DESC flag for an option indicates that the argument has
|
|
a default, which is described by the value of the ARGDEF field. */
|
|
#define GC_OPT_FLAG_NO_ARG_DESC (1UL << 6)
|
|
|
|
/* The NO_CHANGE flag for an option indicates that the user should not
|
|
be allowed to change this option using the standard gpgconf method.
|
|
Frontends using gpgconf should grey out such options, so that only
|
|
the current value is displayed. */
|
|
#define GC_OPT_FLAG_NO_CHANGE (1UL <<7)
|
|
|
|
|
|
#endif /*GNUPG_GC_OPT_FLAGS_H*/
|