* main.h, import.c (parse_import_options, fix_hkp_corruption, import_one,

delete_inv_parts), g10.c (main): New import-option
"repair-hkp-subkey-bug", which repairs as much as possible the HKP
mangling multiple subkeys bug.  It is on by default for keyserver
receives, and off by default for regular --import.

* main.h, import.c (import, import_one, delete_inv_parts), hkp.c
(hkp_ask_import), keyserver.c (keyserver_spawn): Use keyserver import
options when doing keyserver receives.

1 files changed, 2 insertions, 1 deletions

diff --git a/g10/hkp.c b/g10/hkp.c
index 09fa5a12a..234a57835 100644
--- a/g10/hkp.c
+++ b/g10/hkp.c
@@ -98,7 +98,8 @@ hkp_ask_import( KEYDB_SEARCH_DESC *desc, void *stats_handle)
 					    : g10_errstr(rc) );
     }
     else {
-      rc = import_keys_stream( hd.fp_read, 0, stats_handle);
+      rc = import_keys_stream( hd.fp_read, 0, stats_handle,
+			       opt.keyserver_options.import_options);
 	http_close( &hd );
     }