diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 9 | ||||
| -rw-r--r-- | g10/getkey.c | 14 | ||||
| -rw-r--r-- | g10/misc.c | 7 |
3 files changed, 20 insertions, 10 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 578435165..5b3d90782 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,12 @@ +2006-03-01 David Shaw <[email protected]> + + * 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. + 2006-02-27 David Shaw <[email protected]> * options.skel: Document auto-key-locate and give a pointer to diff --git a/g10/getkey.c b/g10/getkey.c index 6c64c77f8..8664c0f0a 100644 --- a/g10/getkey.c +++ b/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 diff --git a/g10/misc.c b/g10/misc.c index b0fe82560..74d05cb56 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -1081,15 +1081,12 @@ unescape_percent_string (const unsigned char *s) } - - int has_invalid_email_chars (const char *s) { int at_seen=0; - static char valid_chars[] = ("01234567890_-." - "abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + const char *valid_chars= + "01234567890_-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; for ( ; *s; s++ ) { |