Commit 3b66a7bb authored by Mark Andrews's avatar Mark Andrews
Browse files

Merge branch 'fanf/bind9-u/fanf2/nsid-logging' into 'master'

Fanf/bind9 u/fanf2/nsid logging

See merge request !338
parents 193cc42b 4862d8ff
Pipeline #2121 passed with stages
in 8 minutes and 22 seconds
4959. [func] NSID logging (enabled by the "request-nsid" option)
now has its own "nsid" category, instead of using the
"resolver" category. [GL !332]
4958. [bug] Remove redundant space from NSEC3 record. [GL #281]
 
4957. [func] The default setting for "dnssec-validation" is now
......
......@@ -6052,7 +6052,7 @@ options {
queries to authoritative name servers during iterative
resolution. If the authoritative server returns an NSID
option in its response, then its contents are logged in
the <command>resolver</command> category at level
the <command>nsid</command> category at level
<command>info</command>.
The default is <userinput>no</userinput>.
</para>
......
......@@ -193,6 +193,16 @@
</para>
</entry>
</row>
<row rowsep="0">
<entry colname="1">
<para><command>nsid</command></para>
</entry>
<entry colname="2">
<para>
NSID options received from upstream servers.
</para>
</entry>
</row>
<row rowsep="0">
<entry colname="1">
<para><command>queries</command></para>
......
......@@ -263,6 +263,13 @@
[GL #203]
</para>
</listitem>
<listitem>
<para>
NSID logging (enabled by the <command>request-nsid</command>
option) now has its own <command>nsid</command> category,
instead of using the <command>resolver</command> category.
</para>
</listitem>
</itemizedlist>
</section>
......
......@@ -40,6 +40,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
#define DNS_LOGCATEGORY_SPILL (&dns_categories[15])
#define DNS_LOGCATEGORY_DNSTAP (&dns_categories[16])
#define DNS_LOGCATEGORY_ZONELOAD (&dns_categories[17])
#define DNS_LOGCATEGORY_NSID (&dns_categories[18])
/* Backwards compatibility. */
#define DNS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL
......
......@@ -40,6 +40,7 @@ LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = {
{ "spill", 0 },
{ "dnstap", 0 },
{ "zoneload", 0 },
{ "nsid", 0 },
{ NULL, 0 }
};
......
......@@ -6964,7 +6964,7 @@ log_nsid(isc_buffer_t *opt, size_t nsid_len, resquery_t *query,
isc_sockaddr_format(&query->addrinfo->sockaddr, addrbuf,
sizeof(addrbuf));
isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
isc_log_write(dns_lctx, DNS_LOGCATEGORY_NSID,
DNS_LOGMODULE_RESOLVER, level,
"received NSID %s (\"%s\") from %s", buf, pbuf, addrbuf);
cleanup:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment