* gpgkeys_ldap.c (build_attrs), ksutil.c (ks_toupper, ks_strcasecmp),

ksutil.h: Remove the need for strcasecmp as the field tags are always
lowercase.

4 files changed, 10 insertions, 33 deletions

diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 355a8b94b..a64f28962 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-28  David Shaw  <[email protected]>
+
+	* gpgkeys_ldap.c (build_attrs), ksutil.c (ks_toupper,
+	ks_strcasecmp), ksutil.h: Remove the need for strcasecmp as the
+	field tags are always lowercase.
+
 2006-09-26  Werner Koch  <[email protected]>
 
 	* gpgkeys_finger.c (get_key): Cast away signed/unsigned char ptr
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 216ed1e1d..1212f97bf 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -367,7 +367,7 @@ build_attrs(LDAPMod ***modlist,char *line)
   if((record=strsep(&line,":"))==NULL)
     return;
 
-  if (ks_strcasecmp("pub",record)==0)
+  if (strcmp("pub",record)==0)
     {
       char *tok;
       int disabled=0,revoked=0;
@@ -473,7 +473,7 @@ build_attrs(LDAPMod ***modlist,char *line)
       make_one_attr(modlist,"pgpDisabled",disabled?"1":"0");
       make_one_attr(modlist,"pgpRevoked",revoked?"1":"0");
     }
-  else if (ks_strcasecmp("sub",record)==0)
+  else if (strcmp("sub",record)==0)
     {
       char *tok;
 
@@ -511,7 +511,7 @@ build_attrs(LDAPMod ***modlist,char *line)
       /* Ignore the rest of the items for subkeys since the LDAP
 	 schema doesn't store them. */
     }
-  else if (ks_strcasecmp("uid",record)==0)
+  else if (strcmp("uid",record)==0)
     {
       char *userid,*tok;
 
@@ -548,7 +548,7 @@ build_attrs(LDAPMod ***modlist,char *line)
 
       make_one_attr(modlist,"pgpUserID",userid);
     }
-  else if(ks_strcasecmp("sig",record)==0)
+  else if(strcmp("sig",record)==0)
     {
       char *tok;
 
diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c
index c302598c4..6d24cb87e 100644
--- a/keyserver/ksutil.c
+++ b/keyserver/ksutil.c
@@ -574,29 +574,3 @@ ks_hextobyte (const char *s)
     return -1;
   return c;
 }
-
-
-/* Non localized version of toupper.  */
-int 
-ks_toupper (int c)
-{
-  if (c >= 'a' && c <= 'z')
-    c &= ~0x20;
-  return c;
-}
-
-
-/* Non localized version of strcasecmp.  */
-int
-ks_strcasecmp (const char *a, const char *b)
-{
-  if (a == b)
-    return 0;
-
-  for (; *a && *b; a++, b++)
-    {
-      if (*a != *b && ks_toupper (*a) != ks_toupper (*b))
-        break;
-    }
-  return *a == *b? 0 : (ks_toupper (*a) - ks_toupper (*b));
-}
diff --git a/keyserver/ksutil.h b/keyserver/ksutil.h
index 0001bbade..069901087 100644
--- a/keyserver/ksutil.h
+++ b/keyserver/ksutil.h
@@ -139,8 +139,5 @@ size_t curl_writer(const void *ptr,size_t size,size_t nmemb,void *cw_ctx);
 void curl_writer_finalize(struct curl_writer_ctx *ctx);
 
 int ks_hextobyte (const char *s);
-int ks_toupper (int c);
-int ks_strcasecmp (const char *a, const char *b);
-
 
 #endif /* !_KSUTIL_H_ */