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
This commit is contained in:
parent
1a7bc88ee7
commit
227c9c763b
@ -1020,6 +1020,8 @@ build_argv (engine_gpg_t gpg, const char *pgmname)
|
|||||||
argc += 1 + !!gpg->flags.use_gpgtar;
|
argc += 1 + !!gpg->flags.use_gpgtar;
|
||||||
if (gpg->flags.no_auto_check_trustdb)
|
if (gpg->flags.no_auto_check_trustdb)
|
||||||
argc += 1 + !!gpg->flags.use_gpgtar;
|
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)
|
if (gpg->pinentry_mode)
|
||||||
argc += 1 + !!gpg->flags.use_gpgtar;
|
argc += 1 + !!gpg->flags.use_gpgtar;
|
||||||
if (!gpg->cmd.used)
|
if (!gpg->cmd.used)
|
||||||
@ -1260,6 +1262,16 @@ build_argv (engine_gpg_t gpg, const char *pgmname)
|
|||||||
argc++;
|
argc++;
|
||||||
if (gpg->flags.proc_all_sigs && have_option_proc_all_sigs (gpg))
|
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");
|
argv[argc] = strdup ("--proc-all-sigs");
|
||||||
if (!argv[argc])
|
if (!argv[argc])
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user