mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Ignore gpg2 introduced keywords for --auto-key-locate.
Minor W32 installer fix.
This commit is contained in:
parent
18f6e7e5d8
commit
e850b7fc22
6 changed files with 19 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
|||
2008-04-30 Werner Koch <wk@g10code.com>
|
||||
|
||||
* getkey.c (parse_auto_key_locate): Ignore nodefault and local
|
||||
methods.
|
||||
|
||||
2008-04-17 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* parse-packet.c (parse_key): Add constant for Camellia-192.
|
||||
|
|
|
@ -3008,6 +3008,12 @@ parse_auto_key_locate(char *options)
|
|||
if(tok[0]=='\0')
|
||||
continue;
|
||||
|
||||
/* For now we silently ignore the new methods introduced with
|
||||
2.0.10. */
|
||||
if (!ascii_strcasecmp (tok,"nodefault")
|
||||
|| !ascii_strcasecmp (tok,"local"))
|
||||
continue;
|
||||
|
||||
akl=xmalloc_clear(sizeof(*akl));
|
||||
|
||||
if(ascii_strcasecmp(tok,"ldap")==0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue