diff options
Diffstat (limited to '')
| -rw-r--r-- | keyserver/ChangeLog | 3 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index ec44ee9b2..565545c01 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,5 +1,8 @@ 2002-10-08 David Shaw <[email protected]> + * gpgkeys_ldap.c (search_key, main): Make sure LDAP values are + freed in case of error. + * gpgkeys_ldap.c (fail_all): New function to unwind a keylist and error each item. (main): Call fail_all from here, as needed. Also add a NO_MEMORY diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 7772bd43c..10ace5426 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -415,18 +415,20 @@ get_key(char *getkey) /* YYYYMMDDHHmmssZ */ vals=ldap_get_values(ldap,each,"pgpkeycreatetime"); - if(vals!=NULL && strlen(vals[0])==15) + if(vals!=NULL) { - fprintf(console,"Key created:\t%.2s/%.2s/%.4s\n", - &vals[0][4],&vals[0][6],vals[0]); + if(strlen(vals[0])==15) + fprintf(console,"Key created:\t%.2s/%.2s/%.4s\n", + &vals[0][4],&vals[0][6],vals[0]); ldap_value_free(vals); } vals=ldap_get_values(ldap,each,"modifytimestamp"); - if(vals!=NULL && strlen(vals[0])==15) + if(vals!=NULL) { - fprintf(console,"Key modified:\t%.2s/%.2s/%.4s\n", - &vals[0][4],&vals[0][6],vals[0]); + if(strlen(vals[0])==15) + fprintf(console,"Key modified:\t%.2s/%.2s/%.4s\n", + &vals[0][4],&vals[0][6],vals[0]); ldap_value_free(vals); } |