Merge branch 'master' into cpu-differentiate-errors

dns.go

@@ -51,9 +51,13 @@ func answer(q dns.Question) ([]dns.RR, int, error) {
 	var domain = strings.ToLower(q.Name)
 	var rtype = q.Qtype
 	r, ok := RR.Records[rtype][domain]
+	if !ok {
+		r, ok = RR.Records[dns.TypeCNAME][domain]
 		if !ok {
 			rcode = dns.RcodeNameError
 		}
+			
+	}
 	log.WithFields(log.Fields{"qtype": dns.TypeToString[rtype], "domain": domain, "rcode": dns.RcodeToString[rcode]}).Debug("Answering question for domain")
 	return r, rcode, nil
 }