diff options
| author | Ingo Klöcker <[email protected]> | 2023-08-14 10:23:07 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2023-08-14 10:24:00 +0000 |
| commit | bc98f01c8599f612dd1035b08f827b0657d94984 (patch) | |
| tree | de93673216394605c2ab53357af468fba10efb23 /src/keylist.c | |
| parent | core: Store engine's version string in gpgsm engine (diff) | |
| download | gpgme-bc98f01c8599f612dd1035b08f827b0657d94984.tar.gz gpgme-bc98f01c8599f612dd1035b08f827b0657d94984.zip | |
core: Use offline mode for all operations of gpgsm engine
* src/engine-backend.h (keylist, keylist_ext): Remove engine_flags.
* src/engine-gpg.c (gpg_keylist, gpg_keylist_ext): Ditto.
* src/engine.c, src/engine.h (_gpgme_engine_op_keylist): Ditto.
(_gpgme_engine_op_keylist_ext): Ditto.
* src/engine.h (GPGME_ENGINE_FLAG_OFFLINE): Remove.
* src/engine-gpgsm.c (struct engine_gpgsm): New field flags with offline
flag.
(have_gpgsm_version): New.
(gpg_set_engine_flags): Set the offline flag.
(start): Send OPTION "offline".
(gpgsm_keylist, gpgsm_keylist_ext): Remove engine_flags. Remove
sending of OPTION "offline".
* src/keylist.c (gpgme_op_keylist_start, gpgme_op_keylist_ext_start):
Remove setting of offline flag.
--
GnuPG-bug-id: 6648
Diffstat (limited to 'src/keylist.c')
| -rw-r--r-- | src/keylist.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/keylist.c b/src/keylist.c index 23b97087..3375f2ef 100644 --- a/src/keylist.c +++ b/src/keylist.c @@ -1126,7 +1126,6 @@ gpgme_op_keylist_start (gpgme_ctx_t ctx, const char *pattern, int secret_only) gpgme_error_t err; void *hook; op_data_t opd; - int flags = 0; TRACE_BEG (DEBUG_CTX, "gpgme_op_keylist_start", ctx, "pattern=%s, secret_only=%i", pattern, secret_only); @@ -1155,11 +1154,8 @@ gpgme_op_keylist_start (gpgme_ctx_t ctx, const char *pattern, int secret_only) if (err) return TRACE_ERR (err); - if (ctx->offline) - flags |= GPGME_ENGINE_FLAG_OFFLINE; - err = _gpgme_engine_op_keylist (ctx->engine, pattern, secret_only, - ctx->keylist_mode, flags); + ctx->keylist_mode); return TRACE_ERR (err); } @@ -1174,7 +1170,6 @@ gpgme_op_keylist_ext_start (gpgme_ctx_t ctx, const char *pattern[], gpgme_error_t err; void *hook; op_data_t opd; - int flags = 0; TRACE_BEG (DEBUG_CTX, "gpgme_op_keylist_ext_start", ctx, "secret_only=%i, reserved=0x%x", secret_only, reserved); @@ -1202,12 +1197,8 @@ gpgme_op_keylist_ext_start (gpgme_ctx_t ctx, const char *pattern[], if (err) return TRACE_ERR (err); - if (ctx->offline) - flags |= GPGME_ENGINE_FLAG_OFFLINE; - err = _gpgme_engine_op_keylist_ext (ctx->engine, pattern, secret_only, - reserved, ctx->keylist_mode, - flags); + reserved, ctx->keylist_mode); return TRACE_ERR (err); } |