security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* gpgkeys_finger.c (get_key), gpgkeys_curl.c (get_key): Better language

Browse Source 
for the key-not-found error.
This commit is contained in:
David Shaw 2005-12-07 23:00:30 +00:00
parent 05193a2705
commit a4fae95d04
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyserver/ChangeLog
View File

@ -1,5 +1,8 @@
2005-12-07 David Shaw <dshaw@jabberwocky.com> 2005-12-07 David Shaw <dshaw@jabberwocky.com>
* 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 * ksutil.c (curl_err_to_gpg_err): Add CURLE_OK and
CURLE_COULDNT_CONNECT. CURLE_COULDNT_CONNECT.

13
keyserver/gpgkeys_curl.c
View File

@ -50,7 +50,6 @@ get_key(char *getkey)
char errorbuffer[CURL_ERROR_SIZE]; char errorbuffer[CURL_ERROR_SIZE];
char request[MAX_URL]; char request[MAX_URL];
struct curl_writer_ctx ctx; struct curl_writer_ctx ctx;
int ret=KEYSERVER_OK;
memset(&ctx,0,sizeof(ctx)); memset(&ctx,0,sizeof(ctx));
@ -71,21 +70,19 @@ get_key(char *getkey)
res=curl_easy_perform(curl); res=curl_easy_perform(curl);
if(res!=CURLE_OK) if(res!=CURLE_OK)
{ {
fprintf(console,"gpgkeys: unable to fetch %s: %s\n",request,errorbuffer); fprintf(console,"gpgkeys: %s fetch error %d: %s\n",opt->scheme,
ret=curl_err_to_gpg_err(res); res,errorbuffer);
fprintf(output,"\nKEY 0x%s FAILED %d\n",getkey,curl_err_to_gpg_err(res));
} }
else if(!ctx.done) else if(!ctx.done)
{ {
fprintf(console,"gpgkeys: no key data found for %s\n",request); 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 else
fprintf(output,"\nKEY 0x%s END\n",getkey); fprintf(output,"\nKEY 0x%s END\n",getkey);
return ret; return curl_err_to_gpg_err(res);
} }
static void static void

6
keyserver/gpgkeys_finger.c
View File

@ -339,9 +339,9 @@ get_key (char *getkey)
fprintf (output,"KEY 0x%s END\n", getkey); fprintf (output,"KEY 0x%s END\n", getkey);
else else
{ {
fprintf (console,"gpgkeys: key %s not found on keyserver\n",getkey); fprintf(console,"gpgkeys: no key data found for finger:%s\n",
fprintf (output,"KEY 0x%s FAILED %d\n", opt->opaque);
getkey,KEYSERVER_KEY_NOT_FOUND); fprintf(output,"KEY 0x%s FAILED %d\n",getkey,KEYSERVER_KEY_NOT_FOUND);
} }
xfree(line); xfree(line);