From aff9aaac68450e76f84d0f9a3feabffe9e82dd7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Wed, 27 Apr 2022 16:57:17 +0200 Subject: core: Support --locate-external-keys command of gpg * src/gpgme.h.in (GPGME_KEYLIST_MODE_FORCE_EXTERN): New. (GPGME_KEYLIST_MODE_LOCATE_EXTERNAL): New. * src/gpgme.c (gpgme_set_keylist_mode): Check for invalid mode. * src/engine-gpg.c (gpg_keylist_build_options): Use "--locate-external-keys" instead of "--locate-keys" if flag is set. * src/gpgme-json.c (op_keylist): New flag "force-extern". * src/gpgme-tool.c (gt_get_keylist_mode, cmd_keylist_mode): Handle new mode. -- GnuPG-bug-id: 5951 --- src/gpgme.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/gpgme.c') diff --git a/src/gpgme.c b/src/gpgme.c index 6a5232e1..2c5b51ea 100644 --- a/src/gpgme.c +++ b/src/gpgme.c @@ -782,6 +782,10 @@ gpgme_set_keylist_mode (gpgme_ctx_t ctx, gpgme_keylist_mode_t mode) if (!ctx) return gpg_error (GPG_ERR_INV_VALUE); + if ((mode & GPGME_KEYLIST_MODE_LOCATE_EXTERNAL) == + (GPGME_KEYLIST_MODE_LOCAL|GPGME_KEYLIST_MODE_FORCE_EXTERN)) + return gpg_error (GPG_ERR_INV_VALUE); + ctx->keylist_mode = mode; return 0; } -- cgit v1.2.3