From: ianmdlvl <ianmdlvl>
Date: Wed, 27 Aug 2008 22:26:52 +0000 (+0000)
Subject: Warn if user specifies a zone with the trailing `.'.
X-Git-Tag: debian_version_4_1_27~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=899c858e89ce7e496f001f62555018ff4c771196

Warn if user specifies a zone with the trailing `.'.
---

diff --git a/debian/changelog b/debian/changelog
index d429b06..976fe02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,15 +3,16 @@ chiark-utils (4.1.27) high; urgency=low
   chiark-named-conf:
   * Remove obsolete +nodebug option from calls to dig;
     required for BIND9 compatibility.  Thanks to Ross Younger.
-  * chiark-named-conf: foreign zones work properly using the configuration
+  * Foreign zones work properly using the configuration
     prevailing at the end of the config file.
+  * Warn if user specifies a zone with the trailing `.'.
 
   Other:
   * hexterm: Declare and document the dependency of hexterm on tcl8.4.
   * chiark-backup: remove snap-mount properly whether it's a dir or a leaf
     node (such as a symlink).
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Wed, 27 Aug 2008 23:14:02 +0100
+ --
 
 chiark-utils (4.1.24) unstable; urgency=low
 
diff --git a/scripts/named-conf b/scripts/named-conf
index 0108a74..120f2b7 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -425,6 +425,11 @@ sub process_zones (@) {
     local ($zone,$cfg);
 
     foreach $zone (@zones) {
+	if ($zone =~ m/\.$/) {
+	    zone_warning("zone specified with trailing dot -".
+			 " will not work", '');
+	}
+
 	$cfg= $zone_cfg{$zone};
 	if (!$cfg) {
 	    $cfg= {