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

dnsdist: Fix building without libssl #6177

Merged
merged 3 commits into from Jan 15, 2018
Merged

Conversation

rgacogne
Copy link
Member

Short description

  • Only fail if DNS over TLS is enabled and we don't have either GnuTLS or OpenSSL libssl
  • Switch GnuTLS to auto, we will detect it but should only link it if DNS over TLS is enabled

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)

Copy link
Collaborator

@zeha zeha left a comment

Choose a reason for hiding this comment

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

Tested, WFM.

Tiny (un)related nit, configure help mentions s2n:

  --enable-dns-over-tls   enable DNS over TLS support (require OpenSSL or s2n)
                          [default=no]

@rgacogne
Copy link
Member Author

Tiny (un)related nit, configure help mentions s2n

Nice catch, fixed!

@rgacogne rgacogne merged commit 6951ba1 into PowerDNS:master Jan 15, 2018
@rgacogne rgacogne deleted the dnsdist-libssl branch January 15, 2018 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants