summaryrefslogtreecommitdiffstats
path: root/g10/options.h
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2017-07-24 21:07:03 +0200
committerWerner Koch <wk@gnupg.org>2017-07-24 21:10:58 +0200
commit87b5421ca84bbea68217c9ed771ee8c0a98a4d0c (patch)
tree07df766cc85680c315c81f953079f2bd30139e65 /g10/options.h
parentgpg: Store key origin info for new keys from a keyserver (diff)
downloadgnupg2-87b5421ca84bbea68217c9ed771ee8c0a98a4d0c.tar.xz
gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'g10/options.h')
-rw-r--r--g10/options.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/options.h b/g10/options.h
index 21249e9ea..83f402853 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -266,6 +266,7 @@ struct
/* The value of --key-origin. See parse_key_origin(). */
int key_origin;
+ char *key_origin_url;
int passphrase_repeat;
int pinentry_mode;