From 671ec45001cb61d8881c0cc297ab59c2e662d43d Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 14 Mar 2006 02:23:00 +0000 Subject: * main.h, import.c (import_one): Optionally return the fingerprint of the key being imported. (import_keys_internal, import_keys_stream, import): Change all callers. --- g10/keyserver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'g10/keyserver.c') diff --git a/g10/keyserver.c b/g10/keyserver.c index 302e5f6d5..2645e728f 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1457,7 +1457,7 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc, way to do this could be to continue parsing this line-by-line and make a temp iobuf for each key. */ - import_keys_stream(spawn->fromchild,stats_handle, + import_keys_stream(spawn->fromchild,stats_handle,NULL,NULL, opt.keyserver_options.import_options); import_print_stats(stats_handle); @@ -1995,7 +1995,8 @@ keyserver_import_cert(const char *name) /* CERTs are always in binary format */ opt.no_armor=1; - rc=import_keys_stream(key,NULL,opt.keyserver_options.import_options); + rc=import_keys_stream(key,NULL,NULL,NULL, + opt.keyserver_options.import_options); opt.no_armor=armor_status; -- cgit v1.2.3