Browse Source

[1502] revised the logic of checking equality of RR types as suggested in review

JINMEI Tatuya 13 years ago
parent
commit
8f3f6eeff4
1 changed files with 2 additions and 3 deletions
  1. 2 3
      src/lib/python/isc/xfrin/diff.py

+ 2 - 3
src/lib/python/isc/xfrin/diff.py

@@ -166,9 +166,8 @@ class Diff:
             '''A helper routine to identify whether two RRsets are of the
             '''A helper routine to identify whether two RRsets are of the
             same 'type'.  For RRSIGs we should consider type covered, too.
             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()
                 return rrset1.get_type() == rrset2.get_type()
             # RR type of the both RRsets is RRSIG.  Compare type covered.
             # RR type of the both RRsets is RRSIG.  Compare type covered.
             # We know they have exactly one RDATA.
             # We know they have exactly one RDATA.