- allow config file to not exist. Closes: #274528.

diff --git a/debian/changelog b/debian/changelog
index d0e3dfac0fa56920eabfe98c64650098c171448a..e2ef1c84d50e296eff7431c7289e9b3ab6a72ff9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ chiark-utils (4.1.22) unstable; urgency=low
     - new allow-indirect-glue directive
     - new forbid-slave directive
     - remove incorrect references to SOA ORIGIN - should be MNAME
+    - allow config file to not exist.  Closes: #274528.
 
  --
 

diff --git a/scripts/named-conf b/scripts/named-conf
index 53d6a75300184f80d804356471a881d4d7662cca..c9ae98de6b08d2c52db8e3e0decf58ddffa1642d 100755 (executable)
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -224,7 +224,11 @@ sub read_config ($) {
        $mod,$dir,$prefix,$suffix,$subfile,$lprefix,$lsuffix,$zf);
     local ($_);
 
-    $fh= new IO::File $if,'r' or cfg_fail("open $if:\n $!");
+    $fh= new IO::File $if,'r';
+    unless ($fh) {
+       return if $! == &ENOENT;
+       cfg_fail("open $if:\n $!");
+    }
     $before= '';
     for (;;) {
        if (!defined($_= <$fh>)) {