aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Fella <[email protected]>2024-10-04 11:17:11 +0000
committerTobias Fella <[email protected]>2024-10-09 07:17:11 +0000
commit227c9c763b30072e9a58bbbe7f66056aa966378f (patch)
tree466dca367226ba684e51444f74d702b4f0ed404e
parentcore: New flag fields beta_compliance. (diff)
downloadgpgme-227c9c763b30072e9a58bbbe7f66056aa966378f.tar.gz
gpgme-227c9c763b30072e9a58bbbe7f66056aa966378f.zip
core: fix passing --proc-all-sigs to gpgtar
* src/engine-gpg.c: Pass --gpg-args before passing --proc-all-sigs if using gpgtar -- GnuPG-Bug-ID: 7320
-rw-r--r--src/engine-gpg.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 6df0617a..318c0e35 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -1020,6 +1020,8 @@ build_argv (engine_gpg_t gpg, const char *pgmname)
argc += 1 + !!gpg->flags.use_gpgtar;
if (gpg->flags.no_auto_check_trustdb)
argc += 1 + !!gpg->flags.use_gpgtar;
+ if (gpg->flags.proc_all_sigs && have_option_proc_all_sigs (gpg))
+ argc += 1 + !!gpg->flags.use_gpgtar;
if (gpg->pinentry_mode)
argc += 1 + !!gpg->flags.use_gpgtar;
if (!gpg->cmd.used)
@@ -1260,6 +1262,16 @@ build_argv (engine_gpg_t gpg, const char *pgmname)
argc++;
if (gpg->flags.proc_all_sigs && have_option_proc_all_sigs (gpg))
{
+ if (gpg->flags.use_gpgtar)
+ {
+ argv[argc] = strdup ("--gpg-args");
+ if (!argv[argc])
+ {
+ err = gpg_error_from_syserror ();
+ goto leave;
+ }
+ argc++;
+ }
argv[argc] = strdup ("--proc-all-sigs");
if (!argv[argc])
{