[svn] GnuPG - r4086 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-04-01 04:47:53 +0200 (Sat, 01 Apr 2006)
New Revision: 4086

Modified:
   trunk/g10/ChangeLog
   trunk/g10/getkey.c
Log:
* getkey.c (get_pubkey_byname): Fix missing auto_key_retrieve unlock.
Fix strings to not start with a capital letter as per convention.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-03-30 23:55:45 UTC (rev 4085)
+++ trunk/g10/ChangeLog	2006-04-01 02:47:53 UTC (rev 4086)
@@ -1,3 +1,9 @@
+2006-03-31  David Shaw  <dshaw at jabberwocky.com>
+
+	* getkey.c (get_pubkey_byname): Fix missing auto_key_retrieve
+	unlock.  Fix strings to not start with a capital letter as per
+	convention.
+
 2006-03-30  David Shaw  <dshaw at jabberwocky.com>
 
 	* main.h, seskey.c (encode_md_value): Modify to allow a q size

Modified: trunk/g10/getkey.c
===================================================================
--- trunk/g10/getkey.c	2006-03-30 23:55:45 UTC (rev 4085)
+++ trunk/g10/getkey.c	2006-04-01 02:47:53 UTC (rev 4086)
@@ -932,16 +932,17 @@
 	      glo_ctrl.in_auto_key_retrieve--;
 
 	      if(rc==0)
-		log_info(_("Automatically retrieved `%s' via %s\n"),
+		log_info(_("automatically retrieved `%s' via %s\n"),
 			 name,"DNS CERT");
 	      break;
 
 	    case AKL_PKA:
 	      glo_ctrl.in_auto_key_retrieve++;
 	      rc=keyserver_import_pka(name,&fpr,&fpr_len);
+	      glo_ctrl.in_auto_key_retrieve--;
 
 	      if(rc==0)
-		log_info(_("Automatically retrieved `%s' via %s\n"),
+		log_info(_("automatically retrieved `%s' via %s\n"),
 			 name,"PKA");
 	      break;
 
@@ -951,7 +952,7 @@
 	      glo_ctrl.in_auto_key_retrieve--;
 
 	      if(rc==0)
-		log_info(_("Automatically retrieved `%s' via %s\n"),
+		log_info(_("automatically retrieved `%s' via %s\n"),
 			 name,"LDAP");
 	      break;
 
@@ -967,7 +968,7 @@
 		  glo_ctrl.in_auto_key_retrieve--;
 
 		  if(rc==0)
-		    log_info(_("Automatically retrieved `%s' via %s\n"),
+		    log_info(_("automatically retrieved `%s' via %s\n"),
 			     name,opt.keyserver->uri);
 		}
 	      break;
@@ -982,7 +983,7 @@
 		glo_ctrl.in_auto_key_retrieve--;
 
 		if(rc==0)
-		  log_info(_("Automatically retrieved `%s' via %s\n"),
+		  log_info(_("automatically retrieved `%s' via %s\n"),
 			   name,akl->spec->uri);
 	      }
 	      break;