diff options
| author | Werner Koch <wk@gnupg.org> | 2017-08-04 21:58:46 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-08-04 22:06:18 +0200 |
| commit | 7e1fe791d188b078398bf83c9af992cb1bd2a4b3 (patch) | |
| tree | 90ab4d9e43f3487af74af2792c47b0310238d0be /g10/keydb.h | |
| parent | agent: Make --no-grab the default. (diff) | |
| download | gnupg2-7e1fe791d188b078398bf83c9af992cb1bd2a4b3.tar.xz gnupg2-7e1fe791d188b078398bf83c9af992cb1bd2a4b3.zip | |
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>
Diffstat (limited to 'g10/keydb.h')
| -rw-r--r-- | g10/keydb.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |