BIND 10 trac1084, updated. f8ef5bcb1e8ebc747b32192348faae9fd32fdba9 Merge branch 'master' into trac1084

BIND 10 source code commits bind10-changes at lists.isc.org
Thu Jun 30 14:22:29 UTC 2011


The branch, trac1084 has been updated
       via  f8ef5bcb1e8ebc747b32192348faae9fd32fdba9 (commit)
       via  666d6e49e1cd46fd293b3fdce239e34588666ed6 (commit)
       via  8b21629d234228ff9fbb7a3c5ad5ebeca4b981c1 (commit)
      from  4191945aad5aaf0873b15727716d0a988b1c978d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f8ef5bcb1e8ebc747b32192348faae9fd32fdba9
Merge: 4191945aad5aaf0873b15727716d0a988b1c978d 666d6e49e1cd46fd293b3fdce239e34588666ed6
Author: Stephen Morris <stephen at isc.org>
Date:   Thu Jun 30 15:22:20 2011 +0100

    Merge branch 'master' into trac1084

-----------------------------------------------------------------------

Summary of changes:
 src/bin/resolver/resolver_messages.mes |   12 ++++++++----
 src/lib/acl/loader.h                   |    2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/resolver_messages.mes b/src/bin/resolver/resolver_messages.mes
index 6c5be64..05b9a8b 100644
--- a/src/bin/resolver/resolver_messages.mes
+++ b/src/bin/resolver/resolver_messages.mes
@@ -210,10 +210,14 @@ query in the form of <Source IP address>#<source port>.
 % RESOLVER_QUERY_REJECTED   query rejected: '%1/%2/%3' from %4
 An informational message that indicates an incoming query is rejected
 in terms of the query ACL.  This results in a response with an RCODE of
-REFUSED.  See QUERYACCEPTED for the information given in the message.
+REFUSED. The log message shows the query in the form of <query
+name>/<query type>/<query class>, and the client that sends the
+query in the form of <Source IP address>#<source port>.
 
 % RESOLVER_QUERY_DROPPED    query dropped: '%1/%2/%3' from %4
 An informational message that indicates an incoming query is dropped
-in terms of the query ACL.  Unlike the QUERYREJECTED case, the server does
-not return any response.  See QUERYACCEPTED for the information given in
-the message.
+in terms of the query ACL.  Unlike the RESOLVER_QUERY_REJECTED
+case, the server does not return any response.  The log message
+shows the query in the form of <query name>/<query type>/<query
+class>, and the client that sends the query in the form of <Source
+IP address>#<source port>.
diff --git a/src/lib/acl/loader.h b/src/lib/acl/loader.h
index 6b024c9..a2aa2f8 100644
--- a/src/lib/acl/loader.h
+++ b/src/lib/acl/loader.h
@@ -81,7 +81,7 @@ public:
  * or if it doesn't contain one of the accepted values.
  *
  * \param action The JSON representation of the action. It must be a string
- *     and contain one of "ACCEPT", "REJECT" or "DENY".
+ *     and contain one of "ACCEPT", "REJECT" or "DROP.
  * \note We could define different names or add aliases if needed.
  */
 BasicAction defaultActionLoader(data::ConstElementPtr action);




More information about the bind10-changes mailing list