aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyserver.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-03-12 13:27:50 +0000
committerWerner Koch <[email protected]>2014-03-12 13:33:51 +0000
commit99135b89ced35d867dddadf9d51e63a3d8837fc3 (patch)
treec4c8d734afc162c134e6df653cd7152167a65eec /g10/keyserver.c
parenthttp: Add a flag to the URL parser indicating a literal v6 address. (diff)
downloadgnupg-99135b89ced35d867dddadf9d51e63a3d8837fc3.tar.gz
gnupg-99135b89ced35d867dddadf9d51e63a3d8837fc3.zip
Comment typo fixes
--
Diffstat (limited to 'g10/keyserver.c')
-rw-r--r--g10/keyserver.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 28b4a1010..b8ab81e46 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1650,13 +1650,16 @@ keyserver_put (ctrl_t ctrl, strlist_t keyspecs,
}
+/* Loop over all URLs in STRLIST and fetch the key that URL. Note
+ that the fetch operation ignores the configured key servers and
+ instead directly retrieves the keys. */
int
keyserver_fetch (ctrl_t ctrl, strlist_t urilist)
{
gpg_error_t err;
strlist_t sl;
estream_t datastream;
- unsigned int options = opt.keyserver_options.import_options;
+ unsigned int save_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.
@@ -1686,7 +1689,7 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist)
es_fclose (datastream);
}
- opt.keyserver_options.import_options = options;
+ opt.keyserver_options.import_options = save_options;
/* If the original options didn't have fast import, and the trustdb
is dirty, rebuild. */