summaryrefslogtreecommitdiffstats
path: root/g10/call-dirmngr.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2017-07-13 17:28:32 +0200
committerWerner Koch <wk@gnupg.org>2017-07-13 18:29:01 +0200
commitfa1155e89ebb4b16ee95549b8ab72672df3a0c54 (patch)
tree515f2f5684c032772406b27e4ea94a91c87e766a /g10/call-dirmngr.c
parentdoc: Document gnupg version requirement for gpg-preset-passphrase. (diff)
downloadgnupg2-fa1155e89ebb4b16ee95549b8ab72672df3a0c54.tar.xz
gnupg2-fa1155e89ebb4b16ee95549b8ab72672df3a0c54.zip
gpg: New option --key-origin.
* g10/keydb.h (KEYORG_): Rename to KEYORG_. * g10/packet.h (PKT_user_id): Rename field keysrc to keyorg. Adjust users. (PKT_public_key): Ditto. (PKT_ring_trust): Ditto. * g10/options.h (struct opt): Add field key_origin. * g10/getkey.c (parse_key_origin): New. * g10/gpg.c (oKeyOrigin): New. (opts): Add "keys-origin". (main): Set option. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/call-dirmngr.c')
-rw-r--r--g10/call-dirmngr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
index cb6c69cd7..76fa07257 100644
--- a/g10/call-dirmngr.c
+++ b/g10/call-dirmngr.c
@@ -379,6 +379,7 @@ ks_status_cb (void *opaque, const char *line)
if ((s = has_leading_keyword (line, parm->keyword? parm->keyword : "SOURCE")))
{
+ /* Note that the arg for "S SOURCE" is the URL of a keyserver. */
if (!parm->source)
{
parm->source = xtrystrdup (s);