diff options
| author | Werner Koch <[email protected]> | 2010-08-31 15:58:39 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-08-31 15:58:39 +0000 |
| commit | 87fac9911241310a4b601e126fa2e26b10bd370f (patch) | |
| tree | 49e09cc881b44a1dba0e9474040cda1d5f9ce581 /g10/keyserver.c | |
| parent | Fix for W32. (diff) | |
| download | gnupg-87fac9911241310a4b601e126fa2e26b10bd370f.tar.gz gnupg-87fac9911241310a4b601e126fa2e26b10bd370f.zip | |
Import OpenPGP keys into the agent.
Diffstat (limited to '')
| -rw-r--r-- | g10/keyserver.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index 27f52719d..39c3d69d9 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1494,9 +1494,10 @@ keyserver_spawn(enum ks_action action,strlist_t list,KEYDB_SEARCH_DESC *desc, gpg complain about "no valid OpenPGP data found". One 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,fpr,fpr_len, - opt.keyserver_options.import_options); + + /* FIXME: Pass CTRL. */ + import_keys_stream (NULL, spawn->fromchild,stats_handle,fpr,fpr_len, + opt.keyserver_options.import_options); import_print_stats(stats_handle); import_release_stats_handle(stats_handle); @@ -2037,8 +2038,9 @@ keyserver_import_cert(const char *name,unsigned char **fpr,size_t *fpr_len) /* CERTs are always in binary format */ opt.no_armor=1; - rc=import_keys_stream(key,NULL,fpr,fpr_len, - opt.keyserver_options.import_options); + /* FIXME: Pass CTRL. */ + rc = import_keys_stream (NULL, key, NULL, fpr, fpr_len, + opt.keyserver_options.import_options); opt.no_armor=armor_status; |