diff options
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/Makefile.am | 2 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 2 | ||||
| -rw-r--r-- | keyserver/ksutil.c | 25 | ||||
| -rw-r--r-- | keyserver/ksutil.h | 2 |
5 files changed, 7 insertions, 29 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index a64f28962..4f9229c6f 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,5 +1,10 @@ 2006-09-28 David Shaw <[email protected]> + * Makefile.am: Link gpgkeys_ldap to libcompat.a. + + * gpgkeys_ldap.c, ksutil.h, ksutil.c: Remove hextobyte instead of + ks_hextobyte as it is provided by libcompat now. + * 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. diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am index 9233fbe8c..337991031 100644 --- a/keyserver/Makefile.am +++ b/keyserver/Makefile.am @@ -36,7 +36,7 @@ gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) gpgkeys_ldap_CPPFLAGS = @LDAP_CPPFLAGS@ -gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ +gpgkeys_ldap_LDADD = ../util/libcompat.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 1212f97bf..cdafe7fa7 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -532,7 +532,7 @@ build_attrs(LDAPMod ***modlist,char *line) while(*tok) if(tok[0]=='%' && tok[1] && tok[2]) { - if((userid[i]=ks_hextobyte(&tok[1]))==-1) + if((userid[i]=hextobyte(&tok[1]))==-1) userid[i]='?'; i++; diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c index 6d24cb87e..44224bc64 100644 --- a/keyserver/ksutil.c +++ b/keyserver/ksutil.c @@ -549,28 +549,3 @@ curl_writer_finalize(struct curl_writer_ctx *ctx) ctx->flags.done=1; } } - -int -ks_hextobyte (const char *s) -{ - int c; - - if ( *s >= '0' && *s <= '9' ) - c = 16 * (*s - '0'); - else if ( *s >= 'A' && *s <= 'F' ) - c = 16 * (10 + *s - 'A'); - else if ( *s >= 'a' && *s <= 'f' ) - c = 16 * (10 + *s - 'a'); - else - return -1; - s++; - if ( *s >= '0' && *s <= '9' ) - c += *s - '0'; - else if ( *s >= 'A' && *s <= 'F' ) - c += 10 + *s - 'A'; - else if ( *s >= 'a' && *s <= 'f' ) - c += 10 + *s - 'a'; - else - return -1; - return c; -} diff --git a/keyserver/ksutil.h b/keyserver/ksutil.h index 069901087..3affc06b6 100644 --- a/keyserver/ksutil.h +++ b/keyserver/ksutil.h @@ -138,6 +138,4 @@ struct curl_writer_ctx 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); - #endif /* !_KSUTIL_H_ */ |