aboutsummaryrefslogtreecommitdiffstats
path: root/g10/options.h
diff options
context:
space:
mode:
Diffstat (limited to 'g10/options.h')
-rw-r--r--g10/options.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/g10/options.h b/g10/options.h
index 46f746d93..f2866f180 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -31,7 +31,7 @@
#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
#define EXTERN_UNLESS_MAIN_MODULE extern
#else
-#define EXTERN_UNLESS_MAIN_MODULE
+#define EXTERN_UNLESS_MAIN_MODULE
#endif
#endif
@@ -85,7 +85,7 @@ struct
int completes_needed;
int max_cert_depth;
const char *homedir;
- const char *agent_program;
+ const char *agent_program;
/* Options to be passed to the gpg-agent */
session_env_t session_env;
@@ -207,7 +207,7 @@ struct
/* If > 0, limit the number of card insertion prompts to this
value. */
- int limit_card_insert_tries;
+ int limit_card_insert_tries;
#ifdef ENABLE_CARD_SUPPORT
/* FIXME: We don't needs this here as it is done in scdaemon. */
@@ -236,8 +236,8 @@ struct
enum {
AKL_NODEFAULT,
AKL_LOCAL,
- AKL_CERT,
- AKL_PKA,
+ AKL_CERT,
+ AKL_PKA,
AKL_LDAP,
AKL_KEYSERVER,
AKL_SPEC
@@ -317,6 +317,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
#define IMPORT_MERGE_ONLY (1<<4)
#define IMPORT_MINIMAL (1<<5)
#define IMPORT_CLEAN (1<<6)
+#define IMPORT_NO_SECKEY (1<<7)
#define EXPORT_LOCAL_SIGS (1<<0)
#define EXPORT_ATTRIBUTES (1<<1)