3256. [bug] Disable empty zones for lwresd -C. [RT #27139]

diff --git a/CHANGES b/CHANGES
index 7b74da4dec14a1669ea11d725ac543fae53cfc4a..a0ccc826db7ddbdff939949f674ed1a11e735ad0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3256.  [bug]           Disable empty zones for lwresd -C. [RT #27139]
+
 3254.  [bug]           Set isc_socket_ipv6only() on the IPv6 control channels.
                        [RT #22249]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 8c7a86246c2833d454a9b2bcfd36a48cc08ae764..97dd8c1be1928917635e7ecf028f15761c965693 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.520.12.29 2011/10/07 04:41:30 each Exp $ */
+/* $Id: server.c,v 1.520.12.30 2011/12/22 08:29:21 marka Exp $ */
 
 /*! \file */
 
@@ -1858,7 +1858,7 @@ configure_view(dns_view_t *view, const cfg_obj_t *config,
                rfc1918 = ISC_FALSE;
                empty_zones_enable = ISC_FALSE;
        }
-       if (empty_zones_enable) {
+       if (empty_zones_enable && !lwresd_g_useresolvconf) {
                const char *empty;
                int empty_zone = 0;
                dns_fixedname_t fixed;