[svn] GnuPG - r3957 - trunk/keyserver

[svn author dshaw]

Author: dshaw
Date: 2005-12-08 00:00:30 +0100 (Thu, 08 Dec 2005)
New Revision: 3957

Modified:
   trunk/keyserver/ChangeLog
   trunk/keyserver/gpgkeys_curl.c
   trunk/keyserver/gpgkeys_finger.c
Log:
* gpgkeys_finger.c (get_key), gpgkeys_curl.c (get_key): Better language
for the key-not-found error.


Modified: trunk/keyserver/ChangeLog
===================================================================
--- trunk/keyserver/ChangeLog	2005-12-07 22:34:11 UTC (rev 3956)
+++ trunk/keyserver/ChangeLog	2005-12-07 23:00:30 UTC (rev 3957)
@@ -1,5 +1,8 @@
 2005-12-07  David Shaw  <dshaw at 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
 	CURLE_COULDNT_CONNECT.
 

Modified: trunk/keyserver/gpgkeys_curl.c
===================================================================
--- trunk/keyserver/gpgkeys_curl.c	2005-12-07 22:34:11 UTC (rev 3956)
+++ trunk/keyserver/gpgkeys_curl.c	2005-12-07 23:00:30 UTC (rev 3957)
@@ -50,7 +50,6 @@
   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 @@
   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 

Modified: trunk/keyserver/gpgkeys_finger.c
===================================================================
--- trunk/keyserver/gpgkeys_finger.c	2005-12-07 22:34:11 UTC (rev 3956)
+++ trunk/keyserver/gpgkeys_finger.c	2005-12-07 23:00:30 UTC (rev 3957)
@@ -339,9 +339,9 @@
     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);