Treat '%' and '$' as special characters for catalog member zone names

The filename of the catalog member zones are generated dynamically
based on the zone's name. If the zone's name is too long or if it
contains special characters the name's digest is used instead.

Since '%' and '$' are now treated as special characters in the zone
names (see !10779), add these characters to the list of the special
characters.

diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index fb4975a3d347df9d397f3c224d42d995e952707a..a100db8ebb257cb77b9f2a339dbeb700ff4072a2 100644 (file)
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -1855,7 +1855,7 @@ dns_catz_generate_masterfilename(dns_catz_zone_t *catz, dns_catz_entry_t *entry,
         * remove it.
         */
        isc_buffer_putuint8(tbuf, 0);
-       if (strpbrk(isc_buffer_base(tbuf), "\\/:") != NULL) {
+       if (strpbrk(isc_buffer_base(tbuf), "\\/:%$") != NULL) {
                special = true;
        }
        isc_buffer_subtract(tbuf, 1);