diff options
| author | David Shaw <[email protected]> | 2005-12-07 23:00:30 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-12-07 23:00:30 +0000 |
| commit | a4fae95d04d58c32717c03b1d74af1a50f9ecea4 (patch) | |
| tree | c5bec6fb5480d402069b12f92ea2f0181e5fa2e3 | |
| parent | * keyserver.c (keyserver_spawn): Don't print "searching for key 00000000" (diff) | |
| download | gnupg-a4fae95d04d58c32717c03b1d74af1a50f9ecea4.tar.gz gnupg-a4fae95d04d58c32717c03b1d74af1a50f9ecea4.zip | |
* gpgkeys_finger.c (get_key), gpgkeys_curl.c (get_key): Better language
for the key-not-found error.
| -rw-r--r-- | keyserver/ChangeLog | 3 | ||||
| -rw-r--r-- | keyserver/gpgkeys_curl.c | 13 | ||||
| -rw-r--r-- | keyserver/gpgkeys_finger.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 6ac71ab98..f5c720cb9 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,5 +1,8 @@ 2005-12-07 David Shaw <[email protected]> + * gpgkeys_finger.c (get_key), gpgkeys_curl.c (get_key): Better + language for the key-not-found error. + * ksutil.c (curl_err_to_gpg_err): Add CURLE_OK and CURLE_COULDNT_CONNECT. diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index 73f8671d2..10e44a156 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.c @@ -50,7 +50,6 @@ get_key(char *getkey) char errorbuffer[CURL_ERROR_SIZE]; char request[MAX_URL]; struct curl_writer_ctx ctx; - int ret=KEYSERVER_OK; memset(&ctx,0,sizeof(ctx)); @@ -71,21 +70,19 @@ get_key(char *getkey) res=curl_easy_perform(curl); if(res!=CURLE_OK) { - fprintf(console,"gpgkeys: unable to fetch %s: %s\n",request,errorbuffer); - ret=curl_err_to_gpg_err(res); + fprintf(console,"gpgkeys: %s fetch error %d: %s\n",opt->scheme, + res,errorbuffer); + fprintf(output,"\nKEY 0x%s FAILED %d\n",getkey,curl_err_to_gpg_err(res)); } else if(!ctx.done) { fprintf(console,"gpgkeys: no key data found for %s\n",request); - ret=KEYSERVER_KEY_NOT_FOUND; + fprintf(output,"\nKEY 0x%s FAILED %d\n",getkey,KEYSERVER_KEY_NOT_FOUND); } - - if(ret) - fprintf(output,"\nKEY 0x%s FAILED %d\n",getkey,ret); else fprintf(output,"\nKEY 0x%s END\n",getkey); - return ret; + return curl_err_to_gpg_err(res); } static void diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c index deafb7a5b..4124ebc72 100644 --- a/keyserver/gpgkeys_finger.c +++ b/keyserver/gpgkeys_finger.c @@ -339,9 +339,9 @@ get_key (char *getkey) fprintf (output,"KEY 0x%s END\n", getkey); else { - fprintf (console,"gpgkeys: key %s not found on keyserver\n",getkey); - fprintf (output,"KEY 0x%s FAILED %d\n", - getkey,KEYSERVER_KEY_NOT_FOUND); + fprintf(console,"gpgkeys: no key data found for finger:%s\n", + opt->opaque); + fprintf(output,"KEY 0x%s FAILED %d\n",getkey,KEYSERVER_KEY_NOT_FOUND); } xfree(line); |