diff options
| author | David Shaw <[email protected]> | 2004-10-11 21:08:37 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-10-11 21:08:37 +0000 |
| commit | bf079613b7082a6aa95e067c535a9e74ecad490b (patch) | |
| tree | 910211f2f4112d1a4589f5e1fb972954e7583790 /g10/keyserver.c | |
| parent | * gpgkeys_finger.c, gpgkeys_hkp.c, gpgkeys_http.c, gpgkeys_ldap.c: Fix a (diff) | |
| download | gnupg-bf079613b7082a6aa95e067c535a9e74ecad490b.tar.gz gnupg-bf079613b7082a6aa95e067c535a9e74ecad490b.zip | |
* pkclist.c (do_edit_ownertrust): Use the same translated string for
showing the user ID as mainproc.c:print_pkenc_list.
* mainproc.c (print_pkenc_list): Allow translating the quotes around the
user ID.
* card-util.c, g10.c, photoid.c, trustdb.c: The last of the \"%s\" -> `%s'
quoting for things that aren't user IDs.
* keyserver.c (keyserver_spawn): If there is no keyserver host, print the
whole URI since it is self-contained.
Diffstat (limited to 'g10/keyserver.c')
| -rw-r--r-- | g10/keyserver.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index 5e29efdf2..e0eebf320 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -892,9 +892,13 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, else BUG(); - log_info(_("requesting key %s from %s server %s\n"), - keystr_from_desc(&desc[i]), - keyserver->scheme,keyserver->host?keyserver->host:""); + if(keyserver->host) + log_info(_("requesting key %s from %s server %s\n"), + keystr_from_desc(&desc[i]), + keyserver->scheme,keyserver->host); + else + log_info(_("requesting key %s from %s\n"), + keystr_from_desc(&desc[i]),keyserver->uri); } fprintf(spawn->tochild,"\n"); @@ -1037,9 +1041,14 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, iobuf_close(buffer); - log_info(_("sending key %s to %s server %s\n"), - keystr(block->pkt->pkt.public_key->keyid), - keyserver->scheme,keyserver->host?keyserver->host:""); + if(keyserver->host) + log_info(_("sending key %s to %s server %s\n"), + keystr(block->pkt->pkt.public_key->keyid), + keyserver->scheme,keyserver->host); + else + log_info(_("sending key %s to %s\n"), + keystr(block->pkt->pkt.public_key->keyid), + keyserver->uri); release_kbnode(block); } @@ -1079,8 +1088,12 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, fprintf(spawn->tochild,"\n"); - log_info(_("searching for \"%s\" from %s server %s\n"), - searchstr,keyserver->scheme,keyserver->host?keyserver->host:""); + if(keyserver->host) + log_info(_("searching for \"%s\" from %s server %s\n"), + searchstr,keyserver->scheme,keyserver->host); + else + log_info(_("searching for \"%s\" from %s\n"), + searchstr,keyserver->uri); break; } |