summaryrefslogtreecommitdiffstats
path: root/doc
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 /doc
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 'doc')
-rw-r--r--doc/gpg.texi8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9147bdf4b..dddb93031 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2260,12 +2260,14 @@ hint to optimize its buffer allocation strategy. It is also used by
the @option{--status-fd} line ``PROGRESS'' to provide a value for
``total'' if that is not available by other means.
-@item --key-origin @var{string}
+@item --key-origin @var{string}[,@var{url}]
@opindex key-origin
gpg can track the origin of a key. Certain origins are implicitly
known (e.g. keyserver, web key directory) and set. For a standard
-import the origin of the keys imported can be set with this optionb.
-To list the possible values use "help" for @var{string}.
+import the origin of the keys imported can be set with this option.
+To list the possible values use "help" for @var{string}. Some origins
+can store an optional @var{url} argument. That URL can appended to
+@var{string} after a comma.
@item --import-options @code{parameters}
@opindex import-options