recursive queries can still return incorrect rcode

While working on qname minimization, in commit b5c9a8ca @wpk fixed a bug that caused recursive queries to return FORMERR when they should return SERVFAIL. This fix turns out to be incomplete; it only catches DNS_R_FORMERR, but not DNS_R_OPTERR.