From 7e1fe791d188b078398bf83c9af992cb1bd2a4b3 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 4 Aug 2017 21:58:46 +0200 Subject: 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 --- g10/getkey.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'g10/getkey.c') diff --git a/g10/getkey.c b/g10/getkey.c index 79bce61c5..5b7aff941 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -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; } -- cgit v1.2.3