From: Mark Andrews <marka@isc.org>
Date: Wed, 17 Nov 2010 03:16:52 +0000 (+0000)
Subject: handle namedxx.conf
X-Git-Tag: v9.6.3b1~39
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c7eb53dd8cae659f3f4151bd22f3331ac44477d1;p=thirdparty%2Fbind9.git

handle namedxx.conf
---

diff --git a/util/merge_copyrights b/util/merge_copyrights
index 9f05cf718b1..e69c5988d08 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: merge_copyrights,v 1.31.322.3 2009/12/03 04:46:44 marka Exp $
+# $Id: merge_copyrights,v 1.31.322.4 2010/11/17 03:16:52 marka Exp $
 
 %file_types = ();
 %file_years = ();
@@ -74,7 +74,7 @@ while (<FILES>) {
 	    $file_types{$_} = "MAN";
 	} elsif ($base =~ /\/Makefile$/) {
 	    $file_types{$_} = "MAKE";
-	} elsif ($base =~ /\/(named|rndc).?\.conf$/) {
+	} elsif ($base =~ /\/(named|rndc).{0,2}\.conf$/) {
 	    $file_types{$_} = "CONF-C";
 	} elsif ($base =~ /\/resolv.?\.conf$/) {
 	    $file_types{$_} = "CONF-SH";