Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect DNSSEC-related warning during history import #1498

Merged
merged 2 commits into from
Dec 10, 2022

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 3, 2022

What does this implement/fix?

dnsmasq recently re-introduced the DNSSEC status ABANDONED and FTL shouldn't complain if we are importing this from the database. This bug exists in master, however, it is very rare to ever encounter ABANDONED and - even then - FTL will only warn on restarts and skip these queries without any other consequences.

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the Bugfix label Dec 3, 2022
@DL6ER DL6ER requested a review from a team December 3, 2022 11:56
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked the surrounding code: Shouldn't be this line

if(status_int < QUERY_UNKNOWN || status_int > QUERY_STATUS_MAX)

be if(status_int < QUERY_UNKNOWN || status_int >= QUERY_STATUS_MAX)

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from yubiuser December 9, 2022 15:43
@DL6ER DL6ER merged commit 9459298 into development Dec 10, 2022
@DL6ER DL6ER deleted the fix/DNSSEC_warning branch December 10, 2022 10:39
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-ftl-v5-20-and-web-v5-18-released/59959/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants