aboutsummaryrefslogtreecommitdiffstats
path: root/tools/gpgconf-comp.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-02-25 14:55:13 +0000
committerWerner Koch <[email protected]>2019-02-26 12:15:58 +0000
commit92e26ade5c0d52f2e50eaf338a0bb8006e75711c (patch)
tree4b1dbc2c66c26074ee9c4da80055accb971477f1 /tools/gpgconf-comp.c
parentscd: Don't let the "undefined" app cause a conflict error. (diff)
downloadgnupg-92e26ade5c0d52f2e50eaf338a0bb8006e75711c.tar.gz
gnupg-92e26ade5c0d52f2e50eaf338a0bb8006e75711c.zip
conf: New option --show-socket.
* tools/gpgconf-comp.c (gc_component_t): Move this enum to ... * tools/gpgconf.h: here. * tools/gpgconf.c (oShowSocket): New. (opts): Add new option. (main): Implement new option. -- This is a convenience options for software which directly connects to gpg-agent and thus needs to new the socket. By using --show-socket along with --launch that software can also autostart the agent or the dirmngr. Without this two calls to gpgconf would be required. Actually the same behaviour can be achieved by running gpg-connect-agent to query the running gpg-agent's socket via GETINFO. The gpg-connect also makes sure that the agent is started. This is not anymore suggested because gpgconf shall in future be used for all such things. Signed-off-by: Werner Koch <[email protected]> (cherry picked from commit ac485b4f253ad6bbd2bc648650b56d60fc82f89d)
Diffstat (limited to '')
-rw-r--r--tools/gpgconf-comp.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index b10b146f4..79a7489f9 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1066,34 +1066,6 @@ static gc_option_t gc_options_pinentry[] =
-/* Component system. Each component is a set of options that can be
- configured at the same time. If you change this, don't forget to
- update GC_COMPONENT below. */
-typedef enum
- {
- /* The classic GPG for OpenPGP. */
- GC_COMPONENT_GPG,
-
- /* 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,
-
- /* The external Pinentry. */
- GC_COMPONENT_PINENTRY,
-
- /* The number of components. */
- GC_COMPONENT_NR
- } gc_component_t;
-
-
/* The information associated with each component. */
static const struct
{