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

diff --git a/debian/changelog b/debian/changelog
index d429b0602afa5db050556e18d45e0881d757f5f6..976fe0251074d9e1552ded6702b729be45fd25fe 100644 (file)
--- 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:
   * 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.
     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).
 
 
   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
 
 
 chiark-utils (4.1.24) unstable; urgency=low
 

diff --git a/scripts/named-conf b/scripts/named-conf
index 0108a740780dbee5b677bbd6481dbeea44dc787b..120f2b7a78f0fd1bbce7aea63bc3485c50384a88 100755 (executable)
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -425,6 +425,11 @@ sub process_zones (@) {
     local ($zone,$cfg);
 
     foreach $zone (@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= {
        $cfg= $zone_cfg{$zone};
        if (!$cfg) {
            $cfg= {