diff options
author | Werner Koch <[email protected]> | 2011-02-04 11:57:53 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2011-02-04 11:57:53 +0000 |
commit | b008274afdbe375b32a7e66dbd073e200f6f0587 (patch) | |
tree | 219e239d39cf06be3f03aa82fb572080ac163a15 /common/dns-cert.c | |
parent | Let autogen.sh check the git config (diff) | |
download | gnupg-b008274afdbe375b32a7e66dbd073e200f6f0587.tar.gz gnupg-b008274afdbe375b32a7e66dbd073e200f6f0587.zip |
Nuked almost all trailing white space.post-nuke-of-trailing-ws
We better do this once and for all instead of cluttering all future
commits with diffs of trailing white spaces. In the majority of cases
blank or single lines are affected and thus this change won't disturb
a git blame too much. For future commits the pre-commit scripts
checks that this won't happen again.
Diffstat (limited to '')
-rw-r--r-- | common/dns-cert.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/dns-cert.c b/common/dns-cert.c index 80ba7d06d..888ffb7b1 100644 --- a/common/dns-cert.c +++ b/common/dns-cert.c @@ -82,7 +82,7 @@ get_dns_cert (const char *name, size_t max_size, IOBUF *iobuf, adns_finish (state); return -1; } - if (answer->status != adns_s_ok) + if (answer->status != adns_s_ok) { /* log_error ("DNS query returned an error: %s (%s)\n", */ /* adns_strerror (answer->status), */ @@ -112,7 +112,7 @@ get_dns_cert (const char *name, size_t max_size, IOBUF *iobuf, *iobuf = iobuf_temp_with_content ((char*)data, datalen); rc = 1; } - else if (ctype == 6 && datalen && datalen < 1023 + else if (ctype == 6 && datalen && datalen < 1023 && datalen >= data[0]+1 && fpr && fpr_len && url) { /* CERT type is IPGP. We made sure tha the data is @@ -126,7 +126,7 @@ get_dns_cert (const char *name, size_t max_size, IOBUF *iobuf, } else *fpr = NULL; - + if (datalen > *fpr_len + 1) { *url = xmalloc (datalen - (*fpr_len+1) + 1); @@ -135,11 +135,11 @@ get_dns_cert (const char *name, size_t max_size, IOBUF *iobuf, } else *url = NULL; - + rc = 2; } } - + adns_free (answer); adns_finish (state); return rc; |