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

Stubresolver: Use only `resolver` setting if given #5112

Merged
merged 1 commit into from Mar 29, 2017

Conversation

Projects
None yet
3 participants
@pieterlexis
Member

pieterlexis commented Mar 6, 2017

Use resolv.conf otherwise. Also, do not use 127.0.0.1:53 as fallback,
as this could be ourselves.

Closes #4655

Short description

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)
Show outdated Hide outdated docs/markdown/authoritative/settings.md Outdated
Show outdated Hide outdated pdns/stubresolver.cc Outdated
Show outdated Hide outdated pdns/stubresolver.cc Outdated
Show outdated Hide outdated pdns/stubresolver.cc Outdated
// Last resort, add 127.0.0.1
if(s_stubresolvers.empty()) {
s_stubresolvers.push_back(ComboAddress("127.0.0.1", 53));

This comment has been minimized.

@Habbie

Habbie Mar 7, 2017

Member

agree on removing this

@Habbie

Habbie Mar 7, 2017

Member

agree on removing this

@Habbie

Habbie approved these changes Mar 9, 2017

approved with two language nits

Show outdated Hide outdated pdns/stubresolver.cc Outdated
Stubresolver: Use only `resolver` setting if given
Use resolv.conf otherwise. Also, do not use 127.0.0.1:53 as fallback,
as this could be ourselves.

Closes #4655

@pieterlexis pieterlexis merged commit 6f39fa6 into PowerDNS:master Mar 29, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pieterlexis pieterlexis deleted the pieterlexis:issue-4655 branch Mar 29, 2017

pieterlexis added a commit to pieterlexis/pdns that referenced this pull request Nov 7, 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