]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[1502] revised the logic of checking equality of RR types as suggested in review
authorJINMEI Tatuya <jinmei@isc.org>
Wed, 28 Dec 2011 19:37:47 +0000 (11:37 -0800)
committerJINMEI Tatuya <jinmei@isc.org>
Wed, 28 Dec 2011 19:37:47 +0000 (11:37 -0800)
src/lib/python/isc/xfrin/diff.py

index f9f5d510e443f568acd9a0baec8b6c3766ef7baf..80fa9099901efff638fa4958697e942f829bc9e6 100644 (file)
@@ -166,9 +166,8 @@ class Diff:
             '''A helper routine to identify whether two RRsets are of the
             same 'type'.  For RRSIGs we should consider type covered, too.
             '''
-            if rrset1.get_type() != rrset2.get_type():
-                return False
-            if rrset1.get_type() != isc.dns.RRType.RRSIG():
+            if rrset1.get_type() != isc.dns.RRType.RRSIG() or \
+                    rrset2.get_type != isc.dns.RRType.RRSIG():
                 return rrset1.get_type() == rrset2.get_type()
             # RR type of the both RRsets is RRSIG.  Compare type covered.
             # We know they have exactly one RDATA.