diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2006-04-01 04:47:53 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2006-04-01 04:47:53 +0200 |
| commit | 4afa4eb10ec9951c517ba9c9c42163f966a4f2b6 (patch) | |
| tree | 0cbcf1d7a778935fdd9bef02621338f16d44c878 | |
| parent | Update copyright (diff) | |
| download | gnupg2-4afa4eb10ec9951c517ba9c9c42163f966a4f2b6.tar.xz gnupg2-4afa4eb10ec9951c517ba9c9c42163f966a4f2b6.zip | |
* getkey.c (get_pubkey_byname): Fix missing auto_key_retrieve unlock.
Fix strings to not start with a capital letter as per convention.
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/getkey.c | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 750c1b31a..ab03a2aa1 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2006-03-31 David Shaw <dshaw@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@jabberwocky.com> * main.h, seskey.c (encode_md_value): Modify to allow a q size diff --git a/g10/getkey.c b/g10/getkey.c index 1c85fb405..42e2927b6 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -932,16 +932,17 @@ get_pubkey_byname (PKT_public_key *pk, 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 @@ get_pubkey_byname (PKT_public_key *pk, 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 @@ get_pubkey_byname (PKT_public_key *pk, 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 @@ get_pubkey_byname (PKT_public_key *pk, 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; |