4381. [bug] Missing "zone-directory" option in catalog zone

			definition caused BIND to crash. [RT #42579]

diff --git a/CHANGES b/CHANGES
index 040c3c6d5ff6fcaee8ef7455448051dd3d030b2c..b45f10e3d3c590d84d395d8cd00910467fd7fdc2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4381.  [bug]           Missing "zone-directory" option in catalog zone
+                       definition caused BIND to crash. [RT #42579]
+
        --- 9.11.0a3 released ---
 
 4380.  [experimental]  Added a "zone-directory" option to "catalog-zones"

diff --git a/bin/named/server.c b/bin/named/server.c
index cd9ed0d17ce04343256c56bc47706e62b3c8cfa7..4fea0f8863129b31c4d53cfef390f4c7337d19d1 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -2367,15 +2367,23 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config,
                result = ns_config_getipandkeylist(config, obj,
                                                   view->mctx, &opts->masters);
 
-       obj = cfg_tuple_get(catz_obj, "zone-directory");
-       if (obj != NULL)
-               opts->zonedir = isc_mem_strdup(view->mctx,
-                                              cfg_obj_asstring(obj));
-
        obj = cfg_tuple_get(catz_obj, "in-memory");
        if (obj != NULL && cfg_obj_isboolean(obj))
                opts->in_memory = cfg_obj_asboolean(obj);
 
+       obj = cfg_tuple_get(catz_obj, "zone-directory");
+       if (!opts->in_memory && obj != NULL && cfg_obj_isstring(obj)) {
+               opts->zonedir = isc_mem_strdup(view->mctx,
+                                              cfg_obj_asstring(obj));
+               if (isc_file_isdirectory(opts->zonedir) != ISC_R_SUCCESS) {
+                       cfg_obj_log(obj, ns_g_lctx, DNS_CATZ_ERROR_LEVEL,
+                                   "catz: zone-directory '%s' "
+                                   "not found; zone files will not be "
+                                   "saved", opts->zonedir);
+                       opts->in_memory = ISC_TRUE;
+               }
+       }
+
        obj = cfg_tuple_get(catz_obj, "min-update-interval");
        if (obj != NULL && cfg_obj_isuint32(obj))
                opts->min_update_interval = cfg_obj_asuint32(obj);

diff --git a/bin/tests/system/catz/clean.sh b/bin/tests/system/catz/clean.sh
index 9912e55dcdb767c6b102fa1b012330a7ef7638d8..46dc9c7e8d797b64ccbc028166b8fb85bccf46af 100644 (file)
--- a/bin/tests/system/catz/clean.sh
+++ b/bin/tests/system/catz/clean.sh
@@ -18,7 +18,8 @@ rm -f ns*/named.memstats
 rm -f ns*/named.run
 rm -f ns*/named.lock
 rm -f ns1/*dom*example.db
-rm -f ns{1,2}/catalog.example.db
+rm -f ns{1,2}/catalog{1,2,3}.example.db
+rm -f ns2/__catz__*db
 rm -rf ns2/zonedir
 rm -f ns*/*.jnl
 rm -f ns*/*.nzf

diff --git a/bin/tests/system/catz/ns1/named.conf b/bin/tests/system/catz/ns1/named.conf
index e096977394f0f97f116f23161d69fd17623c2093..ecdbb0b2d02cb1e44e26fe4968af71972a3f9c67 100644 (file)
--- a/bin/tests/system/catz/ns1/named.conf
+++ b/bin/tests/system/catz/ns1/named.conf
@@ -33,9 +33,27 @@ options {
        recursion no;
 };
 
-zone "catalog.example" {
+zone "catalog1.example" {
        type master;
-       file "catalog.example.db";
+       file "catalog1.example.db";
+       allow-transfer { any; };
+       allow-update { any; };
+       also-notify { 10.53.0.2; };
+       notify explicit;
+};
+
+zone "catalog2.example" {
+       type master;
+       file "catalog2.example.db";
+       allow-transfer { any; };
+       allow-update { any; };
+       also-notify { 10.53.0.2; };
+       notify explicit;
+};
+
+zone "catalog3.example" {
+       type master;
+       file "catalog3.example.db";
        allow-transfer { any; };
        allow-update { any; };
        also-notify { 10.53.0.2; };

diff --git a/bin/tests/system/catz/ns2/named.conf b/bin/tests/system/catz/ns2/named.conf
index 3b9486e2ba9a490f0fa75adce8e233101e80266c..d989b9ebd83d8a1ba950219ce358614f634a61c7 100644 (file)
--- a/bin/tests/system/catz/ns2/named.conf
+++ b/bin/tests/system/catz/ns2/named.conf
@@ -32,15 +32,33 @@ options {
        recursion no;
        serial-query-rate 100;
        catalog-zones {
-               zone "catalog.example"
+               zone "catalog1.example"
                        default-masters { 10.53.0.1; }
                        in-memory no
                        zone-directory "zonedir";
+               zone "catalog2.example"
+                       default-masters { 10.53.0.1; }
+                       in-memory yes;
+               zone "catalog3.example"
+                       default-masters { 10.53.0.1; }
+                       zone-directory "nonexistent";
        };
 };
 
-zone "catalog.example" {
+zone "catalog1.example" {
+       type slave;
+       file "catalog1.example.db";
+       masters { 10.53.0.1; };
+};
+
+zone "catalog2.example" {
+       type slave;
+       file "catalog2.example.db";
+       masters { 10.53.0.1; };
+};
+
+zone "catalog3.example" {
        type slave;
-       file "catalog.example.db";
+       file "catalog3.example.db";
        masters { 10.53.0.1; };
 };

diff --git a/bin/tests/system/catz/setup.sh b/bin/tests/system/catz/setup.sh
index 7a3dbcdb7d7211be199a67c48779a5b936309770..2b8716cdcb82b9d59fb47a4c5a560189fda936f4 100644 (file)
--- a/bin/tests/system/catz/setup.sh
+++ b/bin/tests/system/catz/setup.sh
@@ -19,5 +19,7 @@ SYSTEMTESTTOP=..
 
 $SHELL clean.sh
 
-cat ns1/catalog.example.db.in > ns1/catalog.example.db
+cat ns1/catalog.example.db.in > ns1/catalog1.example.db
+cat ns1/catalog.example.db.in > ns1/catalog2.example.db
+cat ns1/catalog.example.db.in > ns1/catalog3.example.db
 mkdir ns2/zonedir

diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index 4546d89ef38099392609d9fa4d4ff7c6bdc5d9a5..3ea927c52ffa7228bd238661c92e2459176d690a 100644 (file)
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -48,11 +48,11 @@ status=`expr $status + $ret`
 cur=`awk 'BEGIN {l=0} /^/ {l++} END { print l }' ns2/named.run`
 
 n=`expr $n + 1`
-echo "I:Adding domain dom1.example to catalog zone ($n)"
+echo "I:Adding domain dom1.example to catalog1 zone ($n)"
 ret=0
 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
     server 10.53.0.1 5300
-    update add e721433b6160b450260d4f54b3ec8bab30cb3b83.zones.catalog.example 3600 IN PTR dom1.example.
+    update add e721433b6160b450260d4f54b3ec8bab30cb3b83.zones.catalog1.example 3600 IN PTR dom1.example.
     send
 END
 if [ $ret != 0 ]; then echo "I:failed"; fi
@@ -65,7 +65,7 @@ try=0
 while test $try -lt 45
 do
     sleep 1
-    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: adding zone 'dom1.example' from catalog 'catalog.example'" > /dev/null && {
+    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: adding zone 'dom1.example' from catalog 'catalog1.example'" > /dev/null && {
        ret=0
        break
     }
@@ -93,11 +93,11 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo "I:Removing domain dom1.example from catalog zone ($n)"
+echo "I:Removing domain dom1.example from catalog1 zone ($n)"
 ret=0
 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
    server 10.53.0.1 5300
-   update delete e721433b6160b450260d4f54b3ec8bab30cb3b83.zones.catalog.example
+   update delete e721433b6160b450260d4f54b3ec8bab30cb3b83.zones.catalog1.example
    send
 END
 if [ $ret != 0 ]; then echo "I:failed"; fi
@@ -110,7 +110,7 @@ try=0
 while test $try -lt 45
 do
     sleep 1
-    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: deleting zone 'dom1.example' from catalog 'catalog.example'" > /dev/null && {
+    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: deleting zone 'dom1.example' from catalog 'catalog1.example'" > /dev/null && {
        ret=0
        break
     }
@@ -137,21 +137,77 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo "I:Adding domains dom2.example, dom3.example and some trash to catalog zone ($n)"
+echo "I:Adding a domain dom5.example to master via RNDC ($n)"
+ret=0
+echo "@ 3600 IN SOA . . 1 3600 3600 3600 3600" > ns1/dom5.example.db
+echo "@ IN NS invalid." >> ns1/dom5.example.db
+$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953  addzone dom5.example '{type master; file "dom5.example.db";};' || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+n=`expr $n + 1`
+echo "I:Adding domains dom2.example, dom3.example and some trash to catalog1 zone ($n)"
+ret=0
+$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
+    server 10.53.0.1 5300
+    update add 636722929740e507aaf27c502812fc395d30fb17.zones.catalog1.example 3600 IN PTR dom2.example.
+    update add b901f492f3ebf6c1e5b597e51766f02f0479eb03.zones.catalog1.example 3600 IN PTR dom3.example.
+    update add e721433b6160b450260d4f54b3ec8bab30cb3b83.zones.catalog1.example 3600 IN NS foo.bar.
+    update add trash.catalog1.example 3600 IN A 1.2.3.4
+    update add trash2.foo.catalog1.example 3600 IN A 1.2.3.4
+    update add trash3.zones.catalog1.example 3600 IN NS a.dom2.example.
+    send
+END
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+n=`expr $n + 1`
+echo "I:Adding domains dom5.example to catalog2 zone ($n)"
 ret=0
 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
     server 10.53.0.1 5300
-    update add 636722929740e507aaf27c502812fc395d30fb17.zones.catalog.example 3600 IN PTR dom2.example.
-    update add b901f492f3ebf6c1e5b597e51766f02f0479eb03.zones.catalog.example 3600 IN PTR dom3.example.
-    update add e721433b6160b450260d4f54b3ec8bab30cb3b83.zones.catalog.example 3600 IN NS foo.bar.
-    update add trash.catalog.example 3600 IN A 1.2.3.4
-    update add trash2.foo.catalog.example 3600 IN A 1.2.3.4
-    update add trash3.zones.catalog.example 3600 IN NS a.dom2.example.
+    update add de26b88d855397a03f77ff1162fd055d8b419584.zones.catalog2.example 3600 IN PTR dom5.example.
     send
 END
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+
+n=`expr $n + 1`
+echo "I:waiting for slave to sync up ($n)"
+ret=1
+try=0
+while test $try -lt 45
+do
+    sleep 1
+    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: adding zone 'dom5.example' from catalog 'catalog2.example'" > /dev/null && {
+       ret=0
+       break
+    }
+    try=`expr $try + 1`
+done
+try=0
+while test $try -lt 45
+do
+    sleep 1
+    sed -n "$cur,"'$p' < ns2/named.run | grep "transfer of 'dom5.example/IN' from 10.53.0.1#5300: Transfer status: success" > /dev/null && {
+       ret=0
+       break
+    }
+    try=`expr $try + 1`
+done
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+n=`expr $n + 1`
+echo "I:checking that dom5.example is served by slave ($n)"
+ret=0
+$DIG soa dom5.example @10.53.0.2 -p 5300 > dig.out.test$n
+grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+
 n=`expr $n + 1`
 echo "I:checking that dom3.example is not served by master ($n)"
 ret=0
@@ -184,7 +240,7 @@ try=0
 while test $try -lt 45
 do
     sleep 1
-    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: adding zone 'dom3.example' from catalog 'catalog.example'" > /dev/null && {
+    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: adding zone 'dom3.example' from catalog 'catalog1.example'" > /dev/null && {
        ret=0
        break
     }
@@ -216,8 +272,8 @@ echo "I:Adding dom4.example with 'masters' defined and a random label ($n)"
 ret=0
 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
     server 10.53.0.1 5300
-    update add somerandomlabel.zones.catalog.example 3600 IN PTR dom4.example.
-    update add masters.somerandomlabel.zones.catalog.example 3600 IN A 10.53.0.3
+    update add somerandomlabel.zones.catalog1.example 3600 IN PTR dom4.example.
+    update add masters.somerandomlabel.zones.catalog1.example 3600 IN A 10.53.0.3
     send
 END
 if [ $ret != 0 ]; then echo "I:failed"; fi
@@ -230,7 +286,7 @@ try=0
 while test $try -lt 45
 do
     sleep 1
-    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: adding zone 'dom4.example' from catalog 'catalog.example'" > /dev/null && {
+    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: adding zone 'dom4.example' from catalog 'catalog1.example'" > /dev/null && {
        ret=0
        break
     }
@@ -258,11 +314,11 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
 n=`expr $n + 1`
-echo "I:Removing domain dom2.example from catalog zone ($n)"
+echo "I:Removing domain dom2.example from catalog1 zone ($n)"
 ret=0
 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
     server 10.53.0.1 5300
-    update delete 636722929740e507aaf27c502812fc395d30fb17.zones.catalog.example
+    update delete 636722929740e507aaf27c502812fc395d30fb17.zones.catalog1.example
     send
 END
 if [ $ret != 0 ]; then echo "I:failed"; fi
@@ -275,7 +331,7 @@ try=0
 while test $try -lt 45
 do
     sleep 1
-    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: deleting zone 'dom2.example' from catalog 'catalog.example'" > /dev/null && {
+    sed -n "$cur,"'$p' < ns2/named.run | grep "catz: deleting zone 'dom2.example' from catalog 'catalog1.example'" > /dev/null && {
        ret=0
        break
     }
@@ -304,8 +360,15 @@ status=`expr $status + $ret`
 n=`expr $n + 1`
 echo "I:checking that zone-directory is populated ($n)"
 ret=0
-[ -f "ns2/zonedir/__catz___default_catalog.example_dom3.example.db" ] || ret=1
-[ -f "ns2/zonedir/__catz___default_catalog.example_dom4.example.db" ] || ret=1
+[ -f "ns2/zonedir/__catz___default_catalog1.example_dom3.example.db" ] || ret=1
+[ -f "ns2/zonedir/__catz___default_catalog1.example_dom4.example.db" ] || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+n=`expr $n + 1`
+echo "I:checking that a missing zone directory forces in-memory ($n)"
+ret=0
+grep "'nonexistent' not found; zone files will not be saved" ns2/named.run > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`