[master] normalize domain names for trailing dots

4416.	[bug]		dnssec-keymgr: Domain names in policy files could
			fail to match due to trailing dots. [RT #42807]

Patch submitted by Armin Pech (mail@arminpech.de).

diff --git a/CHANGES b/CHANGES
index adb76a253ef4a52a6accf237ab3372cef89cfe21..83850fba42e84c77932307fb69c260030a9a6d3f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4416.  [bug]           dnssec-keymgr: Domain names in policy files could
+                       fail to match due to trailing dots. [RT #42807]
+
 4415.  [bug]           dnssec-keymgr: Expired/deleted keys were not always
                        excluded. [RT #42884]
                        

diff --git a/bin/python/isc/policy.py.in b/bin/python/isc/policy.py.in
index 9cab061ddf78f89e15c14b8f76e57639484baa60..9dec2b8cf3d9d234f9b35ad7d366a0ef7705fd7e 100644 (file)
--- a/bin/python/isc/policy.py.in
+++ b/bin/python/isc/policy.py.in
@@ -535,9 +535,9 @@ class dnssec_policy:
 
     def p_zone_policy(self, p):
         "zone_policy : ZONE name new_policy policy_option_group SEMI"
-        self.current.name = p[2]
+        self.current.name = p[2].rstrip('.')
         self.current.is_zone = True
-        self.zone_policy[p[2].lower()] = self.current
+        self.zone_policy[p[2].rstrip('.').lower()] = self.current
         pass
 
     def p_named_policy(self, p):