diff options
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index c111aa52e..be26f21dc 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2008-03-25 Werner Koch <[email protected]> + + * gpgkeys_ldap.c (build_attrs): Take care of char defaulting to + unsigned when using hextobyte. + 2007-10-25 David Shaw <[email protected]> (wk) From 1.4 (July): diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 0186ce575..f44a5c369 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -531,9 +531,9 @@ build_attrs(LDAPMod ***modlist,char *line) while(*tok) if(tok[0]=='%' && tok[1] && tok[2]) { - if((userid[i]=ks_hextobyte(&tok[1]))==-1) - userid[i]='?'; + int c; + userid[i] = (c=hextobyte(&tok[1])) == -1 ? '?' : c; i++; tok+=3; } |