1670. [func] Log UPDATE requests to slave zones without an acl as

                        "disabled" at debug level 3. [RT# 11657]

diff --git a/CHANGES b/CHANGES
index 7ff12fa3e6ef441f1b23b738fa618a2ddb96c3a5..5a9643ee21619ab69e171f4bdd83fb2849a4cb1b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1670.  [func]          Log UPDATE requests to slave zones without an acl as
+                       "disabled" at debug level 3. [RT# 11657]
+
+1669.  [placeholder]
+
 1668.  [bug]           DIG_SIGCHASE was making bin/dig/host dump core.
 
 1667.  [port]          linux: not all versions have IF_NAMESIZE.

diff --git a/bin/named/update.c b/bin/named/update.c
index f5e8b421f31bb24690066eddfe12301a3e203f92..b4051ecda8552f724b393783d2a068b3064fa1eb 100644 (file)
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.113 2004/06/04 03:44:53 marka Exp $ */
+/* $Id: update.c,v 1.114 2004/06/20 23:57:13 marka Exp $ */
 
 #include <config.h>
 
@@ -247,9 +247,12 @@ checkupdateacl(ns_client_t *client, dns_acl_t *acl, const char *message,
        const char *msg = "denied";
        isc_result_t result;
 
-       if (slave && acl == NULL)
-               return (DNS_R_NOTIMP);
-       result = ns_client_checkaclsilent(client, acl, ISC_FALSE);
+       if (slave && acl == NULL) {
+               result = DNS_R_NOTIMP;
+               level = ISC_LOG_DEBUG(3);
+               msg = "disabled";
+       } else
+               result = ns_client_checkaclsilent(client, acl, ISC_FALSE);
 
        if (result == ISC_R_SUCCESS) {
                level = ISC_LOG_DEBUG(3);