From: Evan Hunt <each@isc.org>
Date: Wed, 20 Jul 2016 21:35:10 +0000 (-0700)
Subject: [master] normalize domain names for trailing dots
X-Git-Tag: v9.12.0a0~172
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a870e4e773a6ad76d63f069127a44aef132cbbfa;p=thirdparty%2Fbind9.git

[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 adb76a253ef..83850fba42e 100644
--- 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 9cab061ddf7..9dec2b8cf3d 100644
--- 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):