gpg: Fix regression due to the keyserver import filter.
authorWerner Koch <wk@gnupg.org>
Wed, 6 Aug 2014 15:11:21 +0000 (17:11 +0200)
committerWerner Koch <wk@gnupg.org>
Wed, 6 Aug 2014 16:43:40 +0000 (18:43 +0200)
commitd58552760b26d840824658814d59c8b1a25a4219
tree6e68d33712f9d2acf4d53b11c9d2506674e8a443
parentdcf58b3471b1c9ba87a826aa132033e506664808
gpg: Fix regression due to the keyserver import filter.

* g10/keyserver.c (keyserver_retrieval_filter): Change args.  Rewrite
to take subpakets in account.
* g10/import.c (import_one, import_secret_one): Pass keyblock to
filter.
--

GnuPG-bug-id: 1680

Resolved conflicts:
g10/main.h - s/import_filter/import_filter_t/g
g10/import.c
g10/keyserver.c
g10/main.h