From c826ccdec1f484266894e2e0be6ffd8c8bcce2fe Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 7 Dec 2005 22:25:58 +0000 Subject: * ksutil.c (curl_err_to_gpg_err): Add CURLE_OK and CURLE_COULDNT_CONNECT. * gpgkeys_curl.c (get_key): Give key-not-found error if no data is found (or file itself is not found) during a fetch. --- keyserver/ksutil.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'keyserver/ksutil.c') diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c index 595637756..e858bd410 100644 --- a/keyserver/ksutil.c +++ b/keyserver/ksutil.c @@ -46,6 +46,7 @@ int register_timeout(void) {return 0;} static void catch_alarm(int foo) { + (void)foo; _exit(KEYSERVER_TIMEOUT); } @@ -362,8 +363,10 @@ curl_err_to_gpg_err(CURLcode error) { switch(error) { - case CURLE_FTP_COULDNT_RETR_FILE: return KEYSERVER_KEY_NOT_FOUND; + case CURLE_OK: return KEYSERVER_OK; case CURLE_UNSUPPORTED_PROTOCOL: return KEYSERVER_SCHEME_NOT_FOUND; + case CURLE_COULDNT_CONNECT: return KEYSERVER_UNREACHABLE; + case CURLE_FTP_COULDNT_RETR_FILE: return KEYSERVER_KEY_NOT_FOUND; default: return KEYSERVER_INTERNAL_ERROR; } } -- cgit v1.2.3