* getkey.c (parse_auto_key_locate): Error if the user selects "cert" or
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 1 Mar 2006 18:16:55 +0000 (18:16 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 1 Mar 2006 18:16:55 +0000 (18:16 +0000)
"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.

g10/ChangeLog
g10/getkey.c
g10/misc.c

index 5784351..5b3d907 100644 (file)
@@ -1,3 +1,12 @@
+2006-03-01  David Shaw  <dshaw@jabberwocky.com>
+
+       * 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  <dshaw@jabberwocky.com>
 
        * options.skel: Document auto-key-locate and give a pointer to
index 6c64c77..8664c0f 100644 (file)
@@ -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
index b0fe825..74d05cb 100644 (file)
@@ -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++ ) 
     {