summaryrefslogtreecommitdiffstats
path: root/g10/keyserver.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2006-08-16 12:47:53 +0200
committerWerner Koch <wk@gnupg.org>2006-08-16 12:47:53 +0200
commitb744f963d7061ce55d2eed65b281298476e54fb7 (patch)
tree6e8ccb3c39a45c16b4ca6cdb2273eb3b8bc2a888 /g10/keyserver.c
parentChanged HTTP API. (diff)
downloadgnupg2-b744f963d7061ce55d2eed65b281298476e54fb7.tar.xz
gnupg2-b744f963d7061ce55d2eed65b281298476e54fb7.zip
With --enable-gpg the keyservers are now build and a first test using gpg2
shows no prblems. Needs more testing of course.
Diffstat (limited to 'g10/keyserver.c')
-rw-r--r--g10/keyserver.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c
index bf1bf6cdc..125872e1c 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -941,7 +941,11 @@ direct_uri_map(const char *scheme,unsigned int is_direct)
return 0;
}
+#if GNUPG_MAJOR_VERSION == 2
+#define GPGKEYS_PREFIX "gpg2keys_"
+#else
#define GPGKEYS_PREFIX "gpgkeys_"
+#endif
#define GPGKEYS_CURL GPGKEYS_PREFIX "curl" EXEEXT
#define GPGKEYS_PREFIX_LEN (strlen(GPGKEYS_CURL))
#define KEYSERVER_ARGS_KEEP " -o \"%O\" \"%I\""