[src/trunk]: src/dist/bind correct conflicts.

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d75a1d9ef86b
branches:  trunk
changeset: 533070:d75a1d9ef86b
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Jun 20 12:01:49 2002 +0000

description:
correct conflicts.
sync document with reality (dig/host/nslookup now does IPv6 transport!)

diffstat:

 dist/bind/bin/named/ns_glue.c |  4 +---
 dist/bind/man/dig.1           |  9 +--------
 dist/bind/man/host.1          |  9 +--------
 dist/bind/man/named.8         |  6 +-----
 dist/bind/man/named.conf.5    |  6 +-----
 dist/bind/man/nslookup.8      |  9 +--------
 6 files changed, 6 insertions(+), 37 deletions(-)

diffs (127 lines):

diff -r 361f5ba67f37 -r d75a1d9ef86b dist/bind/bin/named/ns_glue.c
--- a/dist/bind/bin/named/ns_glue.c     Thu Jun 20 11:42:53 2002 +0000
+++ b/dist/bind/bin/named/ns_glue.c     Thu Jun 20 12:01:49 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ns_glue.c,v 1.5 2002/06/20 11:42:57 itojun Exp $       */
+/*     $NetBSD: ns_glue.c,v 1.6 2002/06/20 12:01:49 itojun Exp $       */
 
 #if !defined(lint) && !defined(SABER)
 static const char rcsid[] = "Id: ns_glue.c,v 8.24 2002/01/07 02:54:37 marka Exp";
@@ -190,7 +190,6 @@
                (print_errno) ? strerror(errno) : "");
 }
 
-#if 1
 /*
  * XXX This is for compatibility and should eventually be removed.
  */
@@ -198,7 +197,6 @@
 panic(const char *msg, const void *arg) {
        ns_panic(ns_log_default, 1, msg, arg);
 }
-#endif
 
 /*
  * How many labels in this name?
diff -r 361f5ba67f37 -r d75a1d9ef86b dist/bind/man/dig.1
--- a/dist/bind/man/dig.1       Thu Jun 20 11:42:53 2002 +0000
+++ b/dist/bind/man/dig.1       Thu Jun 20 12:01:49 2002 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: dig.1,v 1.4 2002/06/20 11:43:09 itojun Exp $
+.\"     $NetBSD: dig.1,v 1.5 2002/06/20 12:01:50 itojun Exp $
 .\"
 .\" Id: dig.1,v 8.9 2002/06/18 01:53:43 marka Exp
 .\"
@@ -704,10 +704,3 @@
 .Ic dig
 simply
 continues with the next query.
-.Pp
-.Nm
-does not support DNS queries/replies over IPv6 transport, and ignores
-IPv6 address on
-.Dq nameserver
-line in
-.Xr resolv.conf 5 .
diff -r 361f5ba67f37 -r d75a1d9ef86b dist/bind/man/host.1
--- a/dist/bind/man/host.1      Thu Jun 20 11:42:53 2002 +0000
+++ b/dist/bind/man/host.1      Thu Jun 20 12:01:49 2002 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: host.1,v 1.8 2002/06/20 11:43:09 itojun Exp $
+.\"     $NetBSD: host.1,v 1.9 2002/06/20 12:01:50 itojun Exp $
 .\"
 .\" ++Copyright++ 1993
 .\" -
@@ -316,10 +316,3 @@
 for all 
 .Dq Ic xxx 
 on the list of name servers, until you find one that works.
-.Pp
-.Nm
-does not support DNS queries/replies over IPv6 transport, and ignores
-IPv6 address on
-.Dq nameserver
-line in
-.Xr resolv.conf 5 .
diff -r 361f5ba67f37 -r d75a1d9ef86b dist/bind/man/named.8
--- a/dist/bind/man/named.8     Thu Jun 20 11:42:53 2002 +0000
+++ b/dist/bind/man/named.8     Thu Jun 20 12:01:49 2002 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: named.8,v 1.10 2002/06/20 11:43:09 itojun Exp $
+.\"     $NetBSD: named.8,v 1.11 2002/06/20 12:01:50 itojun Exp $
 .\"
 .\" ++Copyright++ 1985, 1996
 .\" -
@@ -416,11 +416,7 @@
 .Pc
 .It Dv SIGWINCH
 Toggles logging of all incoming queries via 
-<<<<<<< named.8
 .Xr syslogd 8
-=======
-.Xr syslog 3
->>>>>>> 1.1.1.4
 (requires server to have been built with the 
 .Li QRYLOG 
 option).
diff -r 361f5ba67f37 -r d75a1d9ef86b dist/bind/man/named.conf.5
--- a/dist/bind/man/named.conf.5        Thu Jun 20 11:42:53 2002 +0000
+++ b/dist/bind/man/named.conf.5        Thu Jun 20 12:01:49 2002 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: named.conf.5,v 1.6 2002/06/20 11:43:09 itojun Exp $
+.\"     $NetBSD: named.conf.5,v 1.7 2002/06/20 12:01:50 itojun Exp $
 .\"
 .\" Copyright (c) 1999-2000 by Internet Software Consortium
 .\"
@@ -1424,11 +1424,7 @@
 .Ic sortlist
 statement takes an address match list and interprets it even more
 specially than the 
-<<<<<<< named.conf.5
-.Ic topology 
-=======
 .Ic topology
->>>>>>> 1.1.1.3
 statement does. 
 .Pp
 Each top level statement in the sortlist must itself be an explicit address match
diff -r 361f5ba67f37 -r d75a1d9ef86b dist/bind/man/nslookup.8
--- a/dist/bind/man/nslookup.8  Thu Jun 20 11:42:53 2002 +0000
+++ b/dist/bind/man/nslookup.8  Thu Jun 20 12:01:49 2002 +0000
@@ -1,4 +1,4 @@
-.\"     $NetBSD: nslookup.8,v 1.6 2002/06/20 11:43:09 itojun Exp $
+.\"     $NetBSD: nslookup.8,v 1.7 2002/06/20 12:01:50 itojun Exp $
 .\"
 .\"
 .\" ++Copyright++ 1985, 1989
@@ -535,10 +535,3 @@
 .Dq Domain Names - Implementation and Specification .
 .Sh AUTHOR
 Andrew Cherenson
-.Sh BUGS
-.Nm
-does not support DNS queries/replies over IPv6 transport, and ignores
-IPv6 address on
-.Dq nameserver
-line in
-.Xr resolv.conf 5 .