upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of repo.isc.org:/proj/git/prod/bind9

Browse source
This commit is contained in:
Mark Andrews 2012-11-29 18:11:52 +11:00
commit b455267585
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
3427. [bug] dig +trace incorrectly displayed name server
addresses instead of names. [RT #31641]
3426. [bug] dnssec-checkds: Clearer output when records are not
found. [RT #31968]

2
bin/dig/dig.c
View file

@ -280,7 +280,7 @@ received(int bytes, isc_sockaddr_t *from, dig_query_t *query) {
"from %s(%s) in %d ms\n\n",
query->lookup->doing_xfr ?
query->byte_count : (isc_uint64_t)bytes,
fromtext, query->servname,
fromtext, query->userarg,
(int)diff/1000);
}
}

2
doc/arm/Bv9ARM.ch06.html
View file

@ -1137,7 +1137,7 @@
[ <span><strong class="command">channel</strong></span> <em class="replaceable"><code>channel_name</code></em> {
( <span><strong class="command">file</strong></span> <em class="replaceable"><code>path_name</code></em>
[ <span><strong class="command">versions</strong></span> ( <em class="replaceable"><code>number</code></em> | <span><strong class="command">unlimited</strong></span> ) ]
[ <span><strong class="command">size</strong></span> <em class="replaceable"><code>size spec</code></em> ]
[ <span><strong class="command">size</strong></span> <em class="replaceable"><code>size_spec</code></em> ]
| <span><strong class="command">syslog</strong></span> <em class="replaceable"><code>syslog_facility</code></em>
| <span><strong class="command">stderr</strong></span>
| <span><strong class="command">null</strong></span> );