Tue Jun 23 09:59:55 CDT 2009 Pekka Pessi <first.last@nokia.com>

  * s2dns.c: return CNAME as answer
  Ignore-this: 1beaf31e2a72f2841a097a8d2dea317

  Previously, CNAME was returned as an extra record, not as an answer.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13915 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index bbf309d5c12ed4aa1a359fbf7e090834eb5ba058..89a0db6f38ba87e09f725db2c27fea7332ce5e7d 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Jun 10 11:14:52 EDT 2009
+Tue Jun 23 14:43:15 CDT 2009

diff --git a/libs/sofia-sip/s2check/s2dns.c b/libs/sofia-sip/s2check/s2dns.c
index dc83ba7543b9efcdd0182e70c0723a9045e89435..d57a2a563f5f823c2888a42cc179d4f8fe3cd807 100644 (file)
--- a/libs/sofia-sip/s2check/s2dns.c
+++ b/libs/sofia-sip/s2check/s2dns.c
@@ -600,7 +600,9 @@ void s2_dns_record(
 
     atype = va_arg(va, unsigned);
 
-    if (atype == qtype)
+    if (arcount == 0 &&
+       (atype == qtype || atype == sres_type_cname) &&
+       strcmp(qdomain, domain) == 0)
       ancount++;
     else
       arcount++;
@@ -663,4 +665,3 @@ void s2_dns_record(
 
   va_end(va);
 }
-