comment type fix
[gnupg.git] / g10 / options.h
index eb4dd1b..f9301fd 100644 (file)
@@ -122,21 +122,26 @@ struct {
       int include_revoked;
       int include_disabled;
       int include_subkeys;
-      int include_attributes;
       int honor_http_proxy;
       int broken_http_proxy;
       int use_temp_files;
       int keep_temp_files;
       int fake_v3_keyids;
       int auto_key_retrieve;
+      unsigned int import_options;
+      unsigned int export_options;
       STRLIST other;
     } keyserver_options;
     int exec_disable;
+    int exec_path_set;
+    unsigned int import_options;
+    unsigned int export_options;
     char *def_preference_list;
-    prefitem_t *personal_cipher_prefs,
-               *personal_digest_prefs,
-               *personal_compress_prefs;
+    prefitem_t *personal_cipher_prefs;
+    prefitem_t *personal_digest_prefs;
+    prefitem_t *personal_compress_prefs;
     int no_perm_warn;
+    int no_mdc_warn;
     char *temp_dir;
     int no_encrypt_to;
     int interactive;
@@ -156,6 +161,7 @@ struct {
     int ignore_time_conflict;
     int ignore_valid_from;
     int ignore_crc_error;
+    int ignore_mdc_error;
     int command_fd;
     const char *override_session_key;
     int show_session_key;
@@ -174,8 +180,6 @@ struct {
 } opt;
 
 
-#define EMUBUG_GPGCHKSUM  1
-#define EMUBUG_3DESS2K   2
 #define EMUBUG_MDENCODE   4
 
 #define DBG_PACKET_VALUE  1    /* debug packet reading/writing */