From 8220c9e799b2c4c43e51f712b372892f68a44d6f Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 18 Jan 2005 04:24:52 +0000 Subject: * gpgkeys_curl.c (main): Only allow specified protocols to use the curl handler. * Makefile.am: Use LIBCURL_CPPFLAGS instead of LIBCURL_INCLUDES. --- keyserver/gpgkeys_curl.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'keyserver/gpgkeys_curl.c') diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index ba645782b..c553d79a2 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.c @@ -292,20 +292,23 @@ main(int argc,char *argv[]) fprintf(console,"gpgkeys: no scheme supplied!\n"); return KEYSERVER_SCHEME_NOT_FOUND; } -#ifndef HTTP_VIA_LIBCURL +#ifdef HTTP_VIA_LIBCURL else if(strcasecmp(scheme,"http")==0) - { - fprintf(console,"gpgkeys: scheme `%s' not supported\n",scheme); - return KEYSERVER_SCHEME_NOT_FOUND; - } + ; #endif /* HTTP_VIA_LIBCURL */ -#ifndef FTP_VIA_LIBCURL +#ifdef HTTPS_VIA_LIBCURL + else if(strcasecmp(scheme,"https")==0) + ; +#endif /* HTTP_VIA_LIBCURL */ +#ifdef FTP_VIA_LIBCURL else if(strcasecmp(scheme,"ftp")==0) + ; +#endif /* FTP_VIA_LIBCURL */ + else { fprintf(console,"gpgkeys: scheme `%s' not supported\n",scheme); return KEYSERVER_SCHEME_NOT_FOUND; } -#endif /* FTP_VIA_LIBCURL */ if(timeout && register_timeout()==-1) { -- cgit v1.2.3