diff options
| author | Werner Koch <[email protected]> | 2017-07-24 19:07:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-07-24 19:10:58 +0000 |
| commit | 87b5421ca84bbea68217c9ed771ee8c0a98a4d0c (patch) | |
| tree | 07df766cc85680c315c81f953079f2bd30139e65 /g10/keyserver.c | |
| parent | gpg: Store key origin info for new keys from a keyserver (diff) | |
| download | gnupg-87b5421ca84bbea68217c9ed771ee8c0a98a4d0c.tar.gz gnupg-87b5421ca84bbea68217c9ed771ee8c0a98a4d0c.zip | |
gpg: Extend --key-origin to take an optional URL arg.
* g10/getkey.c (parse_key_origin): Parse appended URL.
* g10/options.h (struct opt): Add field 'key_origin_url'.
* g10/gpg.c (main) <aImport>: Pass that option to import_keys.
* g10/import.c (apply_meta_data): Extend for file and url.
* g10/keyserver.c (keyserver_fetch): Pass the url to
import_keys_es_stream.
--
Example:
gpg --key-origin url,myscheme://bla --import FILE
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/keyserver.c')
| -rw-r--r-- | g10/keyserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index 4d2a2c873..a8c222d3f 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1884,7 +1884,7 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist, int origin) stats_handle = import_new_stats_handle(); import_keys_es_stream (ctrl, datastream, stats_handle, NULL, NULL, opt.keyserver_options.import_options, - NULL, NULL, origin, NULL); + NULL, NULL, origin, sl->d); import_print_stats (stats_handle); import_release_stats_handle (stats_handle); |