core: Do not add obsolete --no-sk-comments to command line
* src/engine-gpg.c (build_argv): Don't add "--no-sk-comments" to argv. -- This option is a no-op since 1.4.3 and 1.4.23 is the latest 1.4 release. GnuPG-bug-id: 6342
This commit is contained in:
parent
64da77620a
commit
984ff7e3a2
@ -944,8 +944,6 @@ build_argv (engine_gpg_t gpg, const char *pgmname)
|
|||||||
if (!gpg->cmd.used)
|
if (!gpg->cmd.used)
|
||||||
argc++; /* --batch */
|
argc++; /* --batch */
|
||||||
|
|
||||||
argc++; /* --no-sk-comments */
|
|
||||||
|
|
||||||
argv = calloc (argc + 1, sizeof *argv);
|
argv = calloc (argc + 1, sizeof *argv);
|
||||||
allocated_argc = argc;
|
allocated_argc = argc;
|
||||||
|
|
||||||
@ -1125,15 +1123,6 @@ build_argv (engine_gpg_t gpg, const char *pgmname)
|
|||||||
}
|
}
|
||||||
argc++;
|
argc++;
|
||||||
}
|
}
|
||||||
argv[argc] = strdup ("--no-sk-comments");
|
|
||||||
if (!argv[argc])
|
|
||||||
{
|
|
||||||
int saved_err = gpg_error_from_syserror ();
|
|
||||||
free (fd_data_map);
|
|
||||||
free_argv (argv);
|
|
||||||
return saved_err;
|
|
||||||
}
|
|
||||||
argc++;
|
|
||||||
for (a = gpg->arglist; a; a = a->next)
|
for (a = gpg->arglist; a; a = a->next)
|
||||||
{
|
{
|
||||||
if (a->arg_locp)
|
if (a->arg_locp)
|
||||||
|
Loading…
Reference in New Issue
Block a user