aboutsummaryrefslogtreecommitdiffstats
path: root/g10/options.h
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2006-02-23 22:39:40 +0000
committerDavid Shaw <[email protected]>2006-02-23 22:39:40 +0000
commit624f3582ba95e43b93586efb23cbd8c624cc18fd (patch)
tree994f7990553622cd08c5cd87d01b3f8dab538c65 /g10/options.h
parent* ksutil.c (init_ks_options): Default include-revoked and include-subkeys (diff)
downloadgnupg-624f3582ba95e43b93586efb23cbd8c624cc18fd.tar.gz
gnupg-624f3582ba95e43b93586efb23cbd8c624cc18fd.zip
* options.c, gpg.c (main), keyserver.c (keyserver_spawn): No special
treatment of include-revoked, include-subkeys, and try-dns-srv. These are keyserver features, and GPG shouldn't get involved here.
Diffstat (limited to '')
-rw-r--r--g10/options.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/g10/options.h b/g10/options.h
index f5ccbbdc0..36de6331b 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -313,14 +313,11 @@ struct {
#define VERIFY_SHOW_UID_VALIDITY (1<<5)
#define VERIFY_SHOW_UNUSABLE_UIDS (1<<6)
-#define KEYSERVER_INCLUDE_REVOKED (1<<0)
-#define KEYSERVER_INCLUDE_SUBKEYS (1<<1)
-#define KEYSERVER_USE_TEMP_FILES (1<<2)
-#define KEYSERVER_KEEP_TEMP_FILES (1<<3)
-#define KEYSERVER_ADD_FAKE_V3 (1<<4)
-#define KEYSERVER_AUTO_KEY_RETRIEVE (1<<5)
-#define KEYSERVER_TRY_DNS_SRV (1<<6)
-#define KEYSERVER_HONOR_KEYSERVER_URL (1<<7)
-#define KEYSERVER_HONOR_PKA_RECORD (1<<8)
+#define KEYSERVER_USE_TEMP_FILES (1<<0)
+#define KEYSERVER_KEEP_TEMP_FILES (1<<1)
+#define KEYSERVER_ADD_FAKE_V3 (1<<2)
+#define KEYSERVER_AUTO_KEY_RETRIEVE (1<<3)
+#define KEYSERVER_HONOR_KEYSERVER_URL (1<<4)
+#define KEYSERVER_HONOR_PKA_RECORD (1<<5)
#endif /*G10_OPTIONS_H*/