1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

* gpgkeys_curl.c (main): Only allow specified protocols to use the

curl handler.

* Makefile.am: Use LIBCURL_CPPFLAGS instead of LIBCURL_INCLUDES.
This commit is contained in:
David Shaw 2005-01-18 04:24:52 +00:00
parent 586be6711e
commit 8220c9e799
3 changed files with 18 additions and 8 deletions

View file

@ -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)
{