Merge pull request #9183 from James-TR/pdns-auth