mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* getkey.c (parse_auto_key_locate): Error if the user selects "cert" or
"pka" when those features are disabled. * misc.c (has_invalid_email_chars): Fix some C syntax that broke the compilers on SGI IRIX MIPS and Compaq/DEC OSF/1 Alpha. Noted by Nelson H. F. Beebe.
This commit is contained in:
parent
2385935afa
commit
78904c691c
3 changed files with 20 additions and 10 deletions
14
g10/getkey.c
14
g10/getkey.c
|
@ -2928,14 +2928,18 @@ parse_auto_key_locate(char *options)
|
|||
|
||||
akl=xmalloc_clear(sizeof(*akl));
|
||||
|
||||
if(ascii_strcasecmp(tok,"cert")==0)
|
||||
akl->type=AKL_CERT;
|
||||
else if(ascii_strcasecmp(tok,"pka")==0)
|
||||
akl->type=AKL_PKA;
|
||||
else if(ascii_strcasecmp(tok,"ldap")==0)
|
||||
if(ascii_strcasecmp(tok,"ldap")==0)
|
||||
akl->type=AKL_LDAP;
|
||||
else if(ascii_strcasecmp(tok,"keyserver")==0)
|
||||
akl->type=AKL_KEYSERVER;
|
||||
#ifdef USE_DNS_CERT
|
||||
else if(ascii_strcasecmp(tok,"cert")==0)
|
||||
akl->type=AKL_CERT;
|
||||
#endif
|
||||
#ifdef USE_DNS_PKA
|
||||
else if(ascii_strcasecmp(tok,"pka")==0)
|
||||
akl->type=AKL_PKA;
|
||||
#endif
|
||||
else if((akl->spec=parse_keyserver_uri(tok,1,NULL,0)))
|
||||
akl->type=AKL_SPEC;
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue