summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/forward.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/forward.c b/src/forward.c
index 7e422e3..ad50783 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -681,6 +681,11 @@ void reply_query(int fd, int family, time_t now)
int class;
if (forward->flags & FREC_DNSKEY_QUERY)
+<<<<<<< HEAD
+ status = dnssec_validate_by_ds(header, n, daemon->namebuff, &class);
+ else if (forward->flags & FREC_DS_QUERY)
+ status = dnssec_validate_dnskey(header, n, daemon->namebuff, &class);
+=======
status = dnssec_validate_by_ds(now, header, n, daemon->namebuff, daemon->keyname, forward->class);
else if (forward->flags & FREC_DS_QUERY)
status = dnssec_validate_ds(now, header, n, daemon->namebuff, daemon->keyname, forward->class);