diff options
| author | David Shaw <[email protected]> | 2005-12-07 22:25:58 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-12-07 22:25:58 +0000 |
| commit | c826ccdec1f484266894e2e0be6ffd8c8bcce2fe (patch) | |
| tree | 4736ae2da64185289c4aa4717e56b7230669943b /keyserver/ksutil.c | |
| parent | Missed file. (diff) | |
| download | gnupg-c826ccdec1f484266894e2e0be6ffd8c8bcce2fe.tar.gz gnupg-c826ccdec1f484266894e2e0be6ffd8c8bcce2fe.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | keyserver/ksutil.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; } } |