diff options
| author | David Shaw <[email protected]> | 2002-12-27 23:46:51 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-12-27 23:46:51 +0000 |
| commit | 55eda4b4f8bef76c8de57cc5e0728825d9c6f3e6 (patch) | |
| tree | 6be960cd4ab859b7156524d8b1d39cc51c0819e7 /g10/keyserver.c | |
| parent | * gpg.sgml: Clarify --no-permission-warning to note that the permission (diff) | |
| download | gnupg-55eda4b4f8bef76c8de57cc5e0728825d9c6f3e6.tar.gz gnupg-55eda4b4f8bef76c8de57cc5e0728825d9c6f3e6.zip | |
* keyserver.c (keyserver_refresh): Don't print the "refreshing..." line if
there are no keys to refresh or if there is no keyserver set.
* getkey.c (merge_selfsigs_main): Any valid user ID should make a key
valid, not just the last one. This also fixes Debian bug #174276.
Diffstat (limited to '')
| -rw-r--r-- | g10/keyserver.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index e09ede6e3..ed7883d47 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1263,17 +1263,23 @@ keyserver_refresh(STRLIST users) if(rc) return rc; - if(count==1) - log_info(_("refreshing 1 key from %s\n"),opt.keyserver_uri); - else - log_info(_("refreshing %d keys from %s\n"),count,opt.keyserver_uri); - if(count>0) - rc=keyserver_work(GET,NULL,desc,count); + { + if(opt.keyserver_uri) + { + if(count==1) + log_info(_("refreshing 1 key from %s\n"),opt.keyserver_uri); + else + log_info(_("refreshing %d keys from %s\n"), + count,opt.keyserver_uri); + } + + rc=keyserver_work(GET,NULL,desc,count); + } m_free(desc); - return 0; + return rc; } int |