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/keydb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/keydb.h') diff --git a/g10/keydb.h b/g10/keydb.h index f793ada77..f503c9990 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -396,7 +396,7 @@ char *get_user_id_byfpr (ctrl_t ctrl, const byte *fpr, size_t *rn); char *get_user_id_byfpr_native (ctrl_t ctrl, const byte *fpr); void release_akl(void); -int parse_auto_key_locate(char *options); +int parse_auto_key_locate(const char *options); int parse_key_origin (char *string); const char *key_origin_string (int origin); -- cgit v1.2.3