projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compiler quietening
[exim.git]
/
src
/
src
/
dns.c
diff --git
a/src/src/dns.c
b/src/src/dns.c
index 56f81de7ab73b7408bf4619d5390d7d4a15f50a5..f492613c4785f0e8141718cd94198ef7469316cb 100644
(file)
--- a/
src/src/dns.c
+++ b/
src/src/dns.c
@@
-443,7
+443,7
@@
Returns: bool indicating presence of AD bit
*/
BOOL
*/
BOOL
-dns_is_secure(const dns_answer *dnsa)
+dns_is_secure(const dns_answer *
dnsa)
{
#ifdef DISABLE_DNSSEC
DEBUG(D_dns)
{
#ifdef DISABLE_DNSSEC
DEBUG(D_dns)
@@
-455,6
+455,13
@@
return h->ad ? TRUE : FALSE;
#endif
}
#endif
}
+static void
+dns_set_insecure(dns_answer * dnsa)
+{
+HEADER * h = (HEADER *)dnsa->answer;
+h->ad = 0;
+}
+
@@
-812,7
+819,7
@@
for (i = 0; i < 10; i++)
if (type_rr.data != NULL)
{
if (!secure_so_far) /* mark insecure if any element of CNAME chain was */
if (type_rr.data != NULL)
{
if (!secure_so_far) /* mark insecure if any element of CNAME chain was */
-
((HEADER *)dnsa->answer)->ad = 0
;
+
dns_set_insecure(dnsa)
;
return DNS_SUCCEED;
}
return DNS_SUCCEED;
}
@@
-1023,7
+1030,7
@@
if (type == T_CSA)
/* Extract the numerical SRV fields (p is incremented) */
p = rr->data;
GETSHORT(priority, p);
/* Extract the numerical SRV fields (p is incremented) */
p = rr->data;
GETSHORT(priority, p);
- GETSHORT(weight, p);
+ GETSHORT(weight, p);
weight = weight; /* compiler quietening */
GETSHORT(port, p);
/* Check the CSA version number */
GETSHORT(port, p);
/* Check the CSA version number */