aboutsummaryrefslogtreecommitdiffstats
path: root/g10/options.h
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2004-05-20 18:04:33 +0000
committerDavid Shaw <[email protected]>2004-05-20 18:04:33 +0000
commitcc383b6432f33b868597268b0b028c4f8b2bc307 (patch)
treee0ebb31f51e12e4052b4f0a7a1261b441a118a74 /g10/options.h
parent* longlong.h: Typo. (diff)
downloadgnupg-cc383b6432f33b868597268b0b028c4f8b2bc307.tar.gz
gnupg-cc383b6432f33b868597268b0b028c4f8b2bc307.zip
* options.h (ctrl): New for member IN_AUTO_KEY_RETRIEVE.
* mainproc.c (check_sig_and_print): track whether we are retrieving a key. * status.c (status_currently_allowed): New. (write_status_text, write_status_text_and_buffer): Use it here. * g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch.
Diffstat (limited to '')
-rw-r--r--g10/options.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/g10/options.h b/g10/options.h
index c2a68b7b5..d8ed34b3e 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -201,6 +201,15 @@ struct
} opt;
+/* CTRL is used to keep some global variables we currently can't
+ avoid. Future concurrent versions of gpg will put it into a per
+ request structure CTRL. */
+EXTERN_UNLESS_MAIN_MODULE
+struct {
+ int in_auto_key_retrieve; /* True if we are doing an
+ auto_key_retrieve. */
+} ctrl;
+
#define DBG_PACKET_VALUE 1 /* debug packet reading/writing */
#define DBG_MPI_VALUE 2 /* debug mpi details */
#define DBG_CIPHER_VALUE 4 /* debug cipher handling */