[Dnsmasq-discuss] [PATCH] Fix compilation without HAVE_DNSSEC

[Pali Rohár]

Do not call add_do_bit which is only for dnssec code.
---
src/forward.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/src/forward.c b/src/forward.c
index 041353c..bffea78 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -793,8 +793,10 @@ void reply_query(int fd, int family, time_t now)
header->hb4 |= HB4_CD;
if (forward->flags |= FREC_AD_QUESTION)
header->hb4 |= HB4_AD;
+#ifdef HAVE_DNSSEC
if (forward->flags & FREC_DO_QUESTION)
add_do_bit(header, nn, (char *)pheader + plen);
+#endif
forward_query(-1, NULL, NULL, 0, header, nn, now, forward, forward->flags & FREC_AD_QUESTION, forward->flags & FREC_DO_QUESTION);
return;
}

[Simon Kelley]

Post by Pali Rohár
Do not call add_do_bit which is only for dnssec code.
---
src/forward.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/forward.c b/src/forward.c
index 041353c..bffea78 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -793,8 +793,10 @@ void reply_query(int fd, int family, time_t now)
header->hb4 |= HB4_CD;
if (forward->flags |= FREC_AD_QUESTION)
header->hb4 |= HB4_AD;
+#ifdef HAVE_DNSSEC
if (forward->flags & FREC_DO_QUESTION)
add_do_bit(header, nn, (char *)pheader + plen);
+#endif
forward_query(-1, NULL, NULL, 0, header, nn, now, forward, forward->flags & FREC_AD_QUESTION, forward->flags & FREC_DO_QUESTION);
return;
}

Is this against 2.75? All the EDNS0 header code has had a major overhaul
in the development code, and I think that this is probably no longer
relevant. If not please shout and I'll look again.


Cheers,

Simon.

[Pali Rohár]

Post by Simon Kelley

Post by Pali Rohár
Do not call add_do_bit which is only for dnssec code.
---
src/forward.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/forward.c b/src/forward.c
index 041353c..bffea78 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -793,8 +793,10 @@ void reply_query(int fd, int family, time_t now)
header->hb4 |= HB4_CD;
if (forward->flags |= FREC_AD_QUESTION)
header->hb4 |= HB4_AD;
+#ifdef HAVE_DNSSEC
if (forward->flags & FREC_DO_QUESTION)
add_do_bit(header, nn, (char *)pheader + plen);
+#endif
forward_query(-1, NULL, NULL, 0, header, nn, now, forward,
forward->flags & FREC_AD_QUESTION, forward->flags &
FREC_DO_QUESTION); return;
}

Is this against 2.75? All the EDNS0 header code has had a major
overhaul in the development code, and I think that this is probably
no longer relevant. If not please shout and I'll look again.

Current code in git: ce5732e84fc46d7f99c152f736cfb4ef5ec98a01