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

ignore SOA-EDIT for PRESIGNED zones. Fixes #5814 #5815

Merged
merged 1 commit into from Oct 12, 2017

Conversation

@Habbie
Copy link
Member

@Habbie Habbie commented Oct 12, 2017

Short description

When a zone is PRESIGNED, we should ignore the SOA-EDIT setting for it, as otherwise we cause the SOA signature to be bogus.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled and tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)
  • checked that this code was merged to master
@Habbie Habbie added this to the auth-4.1.0 milestone Oct 12, 2017
@Habbie Habbie force-pushed the Habbie:presigned-soa-edit branch from 6fdc60d to 6974c17 Oct 12, 2017
// SOA editing on a presigned zone never makes sense
return;
}

getFromMeta(zname, "SOA-EDIT", value);

if ((!soaEdit.empty() || !soaEditSigned.empty()) && value.empty() && !isPresigned(zname)) {

This comment has been minimized.

@rgacogne

rgacogne Oct 12, 2017
Member

The && !isPresigned(zname) part could be removed now

This comment has been minimized.

@Habbie

Habbie Oct 12, 2017
Author Member

Thanks, amended & pushed.

@Habbie Habbie force-pushed the Habbie:presigned-soa-edit branch from 6974c17 to 8bd6094 Oct 12, 2017
@Habbie Habbie force-pushed the Habbie:presigned-soa-edit branch from 8bd6094 to 3ba1065 Oct 12, 2017
@rgacogne rgacogne merged commit 453869f into PowerDNS:master Oct 12, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Habbie Habbie deleted the Habbie:presigned-soa-edit branch Oct 12, 2017
pieterlexis added a commit to pieterlexis/pdns that referenced this pull request Nov 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.