am db42a9f5: Merge "Fix three clang complaints about the DNS code."

* commit 'db42a9f5a3b8a6bb6af2d9ef42844c8dc835527b':
  Fix three clang complaints about the DNS code.