security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

* keyserver.c (keyserver_fetch): Switch on fast-import before we

Browse Source 
--fetch-keys so we don't rebuild the trustdb after each fetch.
This commit is contained in:
David Shaw 2005-12-08 15:37:26 +00:00
parent 0edfbba804
commit 735257ee1c
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-08 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (keyserver_fetch): Switch on fast-import before we
--fetch-keys so we don't rebuild the trustdb after each fetch.
2005-12-08 Werner Koch <wk@g10code.com> 2005-12-08 Werner Koch <wk@g10code.com>
* keyserver.c (keyserver_fetch): Made strings translatable. * keyserver.c (keyserver_fetch): Made strings translatable.

13
g10/keyserver.c
View File

@ -1822,6 +1822,12 @@ keyserver_fetch(STRLIST urilist)
{ {
KEYDB_SEARCH_DESC desc; KEYDB_SEARCH_DESC desc;
STRLIST sl; STRLIST sl;
unsigned int options=opt.keyserver_options.import_options;
/* Switch on fast-import, since fetch can handle more than one
import and we don't want each set to rebuild the trustdb.
Instead we do it once at the end. */
opt.keyserver_options.import_options|=IMPORT_FAST;
/* A dummy desc since we're not actually fetching a particular key /* A dummy desc since we're not actually fetching a particular key
ID */ ID */
@ -1857,5 +1863,12 @@ keyserver_fetch(STRLIST urilist)
log_info (_("WARNING: unable to parse URI %s\n"),sl->d); log_info (_("WARNING: unable to parse URI %s\n"),sl->d);
} }
opt.keyserver_options.import_options=options;
/* If the original options didn't have fast import, and the trustdb
is dirty, rebuild. */
if(!(opt.keyserver_options.import_options&IMPORT_FAST))
trustdb_check_or_update();
return 0; return 0;
} }