From: Bob Halley <halley@nominum.com>
Date: Thu, 24 Mar 2011 17:32:23 +0000 (+0000)
Subject: deal with relative names in _wire_cmp
X-Git-Tag: v1.9.4~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dd82af325c158d38164203873f11ad39262f339;p=thirdparty%2Fdnspython.git

deal with relative names in _wire_cmp
---

diff --git a/dns/rdata.py b/dns/rdata.py
index b4b92515..98f50475 100644
--- a/dns/rdata.py
+++ b/dns/rdata.py
@@ -259,10 +259,14 @@ class Rdata(object):
     def _wire_cmp(self, other):
         # A number of types compare rdata in wire form, so we provide
         # the method here instead of duplicating it.
+        #
+        # We specifiy an arbitrary origin of '.' when doing the
+        # comparison, since the rdata may have relative names and we
+        # can't convert a relative name to wire without an origin.
         b1 = cStringIO.StringIO()
-        self.to_wire(b1)
+        self.to_wire(b1, None, dns.name.root)
         b2 = cStringIO.StringIO()
-        other.to_wire(b2)
+        other.to_wire(b2, None, dns.name.root)
         return cmp(b1.getvalue(), b2.getvalue())
 
     def from_text(cls, rdclass, rdtype, tok, origin = None, relativize = True):