mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpg: Default to --auto-key-locate "local,wkd" and --auto-key-retrieve.
* g10/gpg.c (main): Add KEYSERVER_AUTO_KEY_RETRIEVE to the default keyserver options. Set the default for --auto-key-locate to "local,wkd". Reset that default iff --auto-key-locate has been given in the option file or in the commandline. * g10/getkey.c (parse_auto_key_locate): Work on a copy of the arg. -- GnuPG-bug-id: 3324 Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
3d78ae4d3d
commit
7e1fe791d1
4 changed files with 32 additions and 13 deletions
|
@ -4229,9 +4229,10 @@ release_akl (void)
|
|||
|
||||
/* Returns false on error. */
|
||||
int
|
||||
parse_auto_key_locate (char *options)
|
||||
parse_auto_key_locate (const char *options_arg)
|
||||
{
|
||||
char *tok;
|
||||
char *options = xstrdup (options_arg);
|
||||
|
||||
while ((tok = optsep (&options)))
|
||||
{
|
||||
|
@ -4271,6 +4272,7 @@ parse_auto_key_locate (char *options)
|
|||
else
|
||||
{
|
||||
free_akl (akl);
|
||||
xfree (options);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -4299,6 +4301,7 @@ parse_auto_key_locate (char *options)
|
|||
}
|
||||
}
|
||||
|
||||
xfree (options);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue