Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/bind merge bind-9.9.0a1



details:   https://anonhg.NetBSD.org/src/rev/b665f4eb338f
branches:  trunk
changeset: 769484:b665f4eb338f
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Sep 11 18:55:24 2011 +0000

description:
merge bind-9.9.0a1

diffstat:

 external/bsd/bind/bin/Makefile                                               |     4 +-
 external/bsd/bind/bin/named/Makefile                                         |     4 +-
 external/bsd/bind/bin/tools/Makefile                                         |     7 +
 external/bsd/bind/bin/tools/Makefile.inc                                     |    19 +
 external/bsd/bind/bin/tools/arpaname/Makefile                                |     7 +
 external/bsd/bind/bin/tools/named-journalprint/Makefile                      |     7 +
 external/bsd/bind/bin/tools/nsec3hash/Makefile                               |     7 +
 external/bsd/bind/dist/bin/check/named-checkconf.c                           |     8 +-
 external/bsd/bind/dist/bin/confgen/ddns-confgen.c                            |     7 +-
 external/bsd/bind/dist/bin/confgen/rndc-confgen.c                            |     7 +-
 external/bsd/bind/dist/bin/dig/dig.1                                         |    26 +-
 external/bsd/bind/dist/bin/dig/dig.c                                         |   121 +-
 external/bsd/bind/dist/bin/dig/dighost.c                                     |    61 +-
 external/bsd/bind/dist/bin/dig/host.c                                        |    11 +-
 external/bsd/bind/dist/bin/dig/include/dig/dig.h                             |     9 +-
 external/bsd/bind/dist/bin/dig/nslookup.c                                    |    36 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.8                         |    17 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.c                         |    56 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8                      |    15 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.c                      |    29 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-keygen.8                            |    19 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-keygen.c                            |    44 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-settime.8                           |    21 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-settime.c                           |    38 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-signzone.8                          |    49 +-
 external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c                          |   356 +-
 external/bsd/bind/dist/bin/named/builtin.c                                   |     5 +-
 external/bsd/bind/dist/bin/named/client.c                                    |   142 +-
 external/bsd/bind/dist/bin/named/config.c                                    |     9 +-
 external/bsd/bind/dist/bin/named/control.c                                   |    12 +-
 external/bsd/bind/dist/bin/named/controlconf.c                               |     8 +-
 external/bsd/bind/dist/bin/named/include/named/control.h                     |     8 +-
 external/bsd/bind/dist/bin/named/include/named/globals.h                     |     8 +-
 external/bsd/bind/dist/bin/named/include/named/interfacemgr.h                |    13 +-
 external/bsd/bind/dist/bin/named/include/named/server.h                      |    18 +-
 external/bsd/bind/dist/bin/named/interfacemgr.c                              |    73 +-
 external/bsd/bind/dist/bin/named/logconf.c                                   |    59 +-
 external/bsd/bind/dist/bin/named/main.c                                      |    37 +-
 external/bsd/bind/dist/bin/named/named.conf.5                                |    15 +-
 external/bsd/bind/dist/bin/named/named.conf.docbook                          |    13 +-
 external/bsd/bind/dist/bin/named/named.conf.html                             |    21 +-
 external/bsd/bind/dist/bin/named/query.c                                     |   174 +-
 external/bsd/bind/dist/bin/named/server.c                                    |   677 ++-
 external/bsd/bind/dist/bin/named/statschannel.c                              |     8 +-
 external/bsd/bind/dist/bin/named/unix/os.c                                   |    13 +-
 external/bsd/bind/dist/bin/named/update.c                                    |    67 +-
 external/bsd/bind/dist/bin/named/xfrout.c                                    |    54 +-
 external/bsd/bind/dist/bin/named/zoneconf.c                                  |   188 +-
 external/bsd/bind/dist/bin/nsupdate/nsupdate.c                               |    14 +-
 external/bsd/bind/dist/bin/rndc/rndc.c                                       |     9 +-
 external/bsd/bind/dist/bin/tests/db/t_db.c                                   |    37 +-
 external/bsd/bind/dist/bin/tests/dst/gsstest.c                               |    26 +-
 external/bsd/bind/dist/bin/tests/dst/t_dst.c                                 |    72 +-
 external/bsd/bind/dist/bin/tests/master/t_master.c                           |     7 +-
 external/bsd/bind/dist/bin/tests/names/t_names.c                             |    15 +-
 external/bsd/bind/dist/bin/tests/rbt/t_rbt.c                                 |    17 +-
 external/bsd/bind/dist/bin/tests/rdata_test.c                                |    33 +-
 external/bsd/bind/dist/bin/tests/resolver/t_resolver.c                       |     4 +-
 external/bsd/bind/dist/bin/tests/system/dlv/ns1/root.db                      |    24 -
 external/bsd/bind/dist/bin/tests/system/dlzexternal/ns1/named.conf           |    47 -
 external/bsd/bind/dist/bin/tests/system/filter-aaaa/filter-aaaa.c            |    13 +-
 external/bsd/bind/dist/bin/tests/system/ixfr/ans2/ans.pl                     |   157 -
 external/bsd/bind/dist/bin/tests/system/tsiggss/ns1/example.nil.db           |    51 -
 external/bsd/bind/dist/bin/tests/tasks/t_tasks.c                             |   162 +-
 external/bsd/bind/dist/bin/tests/timers/t_timers.c                           |    48 +-
 external/bsd/bind/dist/bin/tools/genrandom.8                                 |    10 +-
 external/bsd/bind/dist/bin/tools/nsec3hash.c                                 |     4 +-
 external/bsd/bind/dist/config.h.in                                           |    17 +-
 external/bsd/bind/dist/contrib/dlz/drivers/dlz_dlopen_driver.c               |     2 +-
 external/bsd/bind/dist/contrib/dlz/drivers/dlz_drivers.c                     |    18 +-
 external/bsd/bind/dist/contrib/dlz/drivers/dlz_ldap_driver.c                 |   132 +-
 external/bsd/bind/dist/contrib/dlz/drivers/include/dlz/dlz_dlopen_driver.h   |    56 +-
 external/bsd/bind/dist/doc/draft/draft-ietf-dnsext-rfc2671bis-edns0-02.txt   |   616 ---
 external/bsd/bind/dist/doc/draft/draft-ietf-dnsop-default-local-zones-10.txt |   728 ---
 external/bsd/bind/dist/doc/draft/draft-ietf-dnsop-dnssec-key-timing-00.txt   |  1960 ----------
 external/bsd/bind/dist/lib/bind9/check.c                                     |   145 +-
 external/bsd/bind/dist/lib/dns/acl.c                                         |    15 +-
 external/bsd/bind/dist/lib/dns/adb.c                                         |    15 +-
 external/bsd/bind/dist/lib/dns/cache.c                                       |   213 +-
 external/bsd/bind/dist/lib/dns/client.c                                      |    14 +-
 external/bsd/bind/dist/lib/dns/diff.c                                        |    20 +-
 external/bsd/bind/dist/lib/dns/dispatch.c                                    |   149 +-
 external/bsd/bind/dist/lib/dns/dlz.c                                         |    11 +-
 external/bsd/bind/dist/lib/dns/dns64.c                                       |     8 +-
 external/bsd/bind/dist/lib/dns/dnssec.c                                      |   101 +-
 external/bsd/bind/dist/lib/dns/dst_api.c                                     |    36 +-
 external/bsd/bind/dist/lib/dns/dst_internal.h                                |     5 +-
 external/bsd/bind/dist/lib/dns/dst_openssl.h                                 |    21 +-
 external/bsd/bind/dist/lib/dns/dst_parse.c                                   |    21 +-
 external/bsd/bind/dist/lib/dns/gssapi_link.c                                 |    10 +-
 external/bsd/bind/dist/lib/dns/gssapictx.c                                   |    22 +-
 external/bsd/bind/dist/lib/dns/include/dns/acl.h                             |    23 +-
 external/bsd/bind/dist/lib/dns/include/dns/cache.h                           |    51 +-
 external/bsd/bind/dist/lib/dns/include/dns/db.h                              |    12 +-
 external/bsd/bind/dist/lib/dns/include/dns/dispatch.h                        |    15 +-
 external/bsd/bind/dist/lib/dns/include/dns/dlz.h                             |    12 +-
 external/bsd/bind/dist/lib/dns/include/dns/dnssec.h                          |    29 +-
 external/bsd/bind/dist/lib/dns/include/dns/masterdump.h                      |    10 +-
 external/bsd/bind/dist/lib/dns/include/dns/nsec.h                            |     9 +-
 external/bsd/bind/dist/lib/dns/include/dns/rdata.h                           |    16 +-
 external/bsd/bind/dist/lib/dns/include/dns/rdataset.h                        |     6 +-
 external/bsd/bind/dist/lib/dns/include/dns/resolver.h                        |     4 +-
 external/bsd/bind/dist/lib/dns/include/dns/result.h                          |     7 +-
 external/bsd/bind/dist/lib/dns/include/dns/sdlz.h                            |    38 +-
 external/bsd/bind/dist/lib/dns/include/dns/types.h                           |    20 +-
 external/bsd/bind/dist/lib/dns/include/dns/view.h                            |    32 +-
 external/bsd/bind/dist/lib/dns/include/dns/zone.h                            |    81 +-
 external/bsd/bind/dist/lib/dns/include/dst/dst.h                             |    27 +-
 external/bsd/bind/dist/lib/dns/journal.c                                     |     9 +-
 external/bsd/bind/dist/lib/dns/key.c                                         |    18 +-
 external/bsd/bind/dist/lib/dns/master.c                                      |    16 +-
 external/bsd/bind/dist/lib/dns/masterdump.c                                  |    84 +-
 external/bsd/bind/dist/lib/dns/message.c                                     |     6 +-
 external/bsd/bind/dist/lib/dns/name.c                                        |    23 +-
 external/bsd/bind/dist/lib/dns/ncache.c                                      |     4 +-
 external/bsd/bind/dist/lib/dns/nsec.c                                        |    12 +-
 external/bsd/bind/dist/lib/dns/nsec3.c                                       |     9 +-
 external/bsd/bind/dist/lib/dns/openssl_link.c                                |    20 +-
 external/bsd/bind/dist/lib/dns/openssldsa_link.c                             |     5 +-
 external/bsd/bind/dist/lib/dns/opensslrsa_link.c                             |    22 +-
 external/bsd/bind/dist/lib/dns/private.c                                     |     9 +-
 external/bsd/bind/dist/lib/dns/rbt.c                                         |    11 +-
 external/bsd/bind/dist/lib/dns/rbtdb.c                                       |    63 +-
 external/bsd/bind/dist/lib/dns/rbtdb.h                                       |    19 +-
 external/bsd/bind/dist/lib/dns/rcode.c                                       |    15 +-
 external/bsd/bind/dist/lib/dns/rdata.c                                       |   196 +-
 external/bsd/bind/dist/lib/dns/rdata/any_255/tsig_250.c                      |    18 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/cert_37.c                       |    13 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/dlv_32769.c                     |    12 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/dnskey_48.c                     |    48 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/ds_43.c                         |    12 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/ipseckey_45.c                   |    11 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/key_25.c                        |    19 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/keydata_65533.c                 |    34 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/nsec3_50.c                      |    49 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/nsec3_50.h                      |    51 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c                        |    14 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/rrsig_46.c                      |    21 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/sig_24.c                        |    13 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/soa_6.c                         |     8 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/sshfp_44.c                      |    12 +-
 external/bsd/bind/dist/lib/dns/rdata/generic/tkey_249.c                      |    20 +-
 external/bsd/bind/dist/lib/dns/rdata/in_1/dhcid_49.c                         |    13 +-
 external/bsd/bind/dist/lib/dns/rdata/in_1/naptr_35.c                         |   712 ---
 external/bsd/bind/dist/lib/dns/rdata/in_1/naptr_35.h                         |    42 -
 external/bsd/bind/dist/lib/dns/rdatalist.c                                   |    26 +-
 external/bsd/bind/dist/lib/dns/rdataset.c                                    |     7 +-
 external/bsd/bind/dist/lib/dns/rdataslab.c                                   |     4 +-
 external/bsd/bind/dist/lib/dns/request.c                                     |     8 +-
 external/bsd/bind/dist/lib/dns/resolver.c                                    |    25 +-
 external/bsd/bind/dist/lib/dns/result.c                                      |     5 +-
 external/bsd/bind/dist/lib/dns/sdb.c                                         |     6 +-
 external/bsd/bind/dist/lib/dns/sdlz.c                                        |    23 +-
 external/bsd/bind/dist/lib/dns/spnego.c                                      |    70 +-
 external/bsd/bind/dist/lib/dns/ssu_external.c                                |    31 +-
 external/bsd/bind/dist/lib/dns/time.c                                        |    48 +-
 external/bsd/bind/dist/lib/dns/tkey.c                                        |    14 +-
 external/bsd/bind/dist/lib/dns/tsig.c                                        |     6 +-
 external/bsd/bind/dist/lib/dns/ttl.c                                         |     7 +-
 external/bsd/bind/dist/lib/dns/validator.c                                   |   114 +-
 external/bsd/bind/dist/lib/dns/view.c                                        |    42 +-
 external/bsd/bind/dist/lib/dns/xfrin.c                                       |     8 +-
 external/bsd/bind/dist/lib/dns/zone.c                                        |  1425 ++++--
 external/bsd/bind/dist/lib/dns/zt.c                                          |    14 +-
 external/bsd/bind/dist/lib/export/samples/nsprobe.c                          |    12 +-
 external/bsd/bind/dist/lib/irs/getnameinfo.c                                 |    12 +-
 external/bsd/bind/dist/lib/irs/resconf.c                                     |     7 +-
 external/bsd/bind/dist/lib/isc/heap.c                                        |    11 +-
 external/bsd/bind/dist/lib/isc/httpd.c                                       |    52 +-
 external/bsd/bind/dist/lib/isc/include/isc/file.h                            |    25 +-
 external/bsd/bind/dist/lib/isc/include/isc/mem.h                             |     8 +-
 external/bsd/bind/dist/lib/isc/include/isc/namespace.h                       |     8 +-
 external/bsd/bind/dist/lib/isc/include/isc/socket.h                          |    20 +-
 external/bsd/bind/dist/lib/isc/include/isc/task.h                            |     4 +-
 external/bsd/bind/dist/lib/isc/include/isc/taskpool.h                        |    53 +-
 external/bsd/bind/dist/lib/isc/include/isc/util.h                            |    11 +-
 external/bsd/bind/dist/lib/isc/log.c                                         |    11 +-
 external/bsd/bind/dist/lib/isc/netaddr.c                                     |    26 +-
 external/bsd/bind/dist/lib/isc/powerpc/include/isc/atomic.h                  |    24 +-
 external/bsd/bind/dist/lib/isc/radix.c                                       |     8 +-
 external/bsd/bind/dist/lib/isc/rwlock.c                                      |     7 +-
 external/bsd/bind/dist/lib/isc/sha1.c                                        |     9 +-
 external/bsd/bind/dist/lib/isc/sha2.c                                        |    27 +-
 external/bsd/bind/dist/lib/isc/sockaddr.c                                    |     9 +-
 external/bsd/bind/dist/lib/isc/socket_api.c                                  |    21 +-
 external/bsd/bind/dist/lib/isc/string.c                                      |    13 +-
 external/bsd/bind/dist/lib/isc/task.c                                        |     4 +-
 external/bsd/bind/dist/lib/isc/taskpool.c                                    |   118 +-
 external/bsd/bind/dist/lib/isc/timer.c                                       |    11 +-
 external/bsd/bind/dist/lib/isc/unix/dir.c                                    |     8 +-
 external/bsd/bind/dist/lib/isc/unix/file.c                                   |    21 +-
 external/bsd/bind/dist/lib/isc/unix/include/isc/stdtime.h                    |    10 +-
 external/bsd/bind/dist/lib/isc/unix/socket.c                                 |   273 +-
 external/bsd/bind/dist/lib/isc/unix/stdio.c                                  |     7 +-
 external/bsd/bind/dist/lib/isc/unix/time.c                                   |     8 +-
 external/bsd/bind/dist/lib/isc/win32/dir.c                                   |     8 +-
 external/bsd/bind/dist/lib/isc/win32/file.c                                  |    21 +-
 external/bsd/bind/dist/lib/isc/win32/include/isc/ipv6.h                      |     4 +-
 external/bsd/bind/dist/lib/isc/win32/include/isc/stdtime.h                   |    10 +-
 external/bsd/bind/dist/lib/isc/win32/socket.c                                |    99 +-
 external/bsd/bind/dist/lib/isccfg/aclconf.c                                  |    83 +-
 external/bsd/bind/dist/lib/isccfg/include/isccfg/aclconf.h                   |    24 +-
 external/bsd/bind/dist/lib/isccfg/namedconf.c                                |    60 +-
 external/bsd/bind/dist/lib/isccfg/parser.c                                   |    15 +-
 external/bsd/bind/dist/lib/lwres/assert_p.h                                  |     9 +-
 external/bsd/bind/dist/lib/lwres/herror.c                                    |     8 +-
 external/bsd/bind/dist/lib/lwres/lwconfig.c                                  |     7 +-
 external/bsd/bind/dist/lib/lwres/print.c                                     |     7 +-
 external/bsd/bind/include/config.h                                           |    21 +-
 external/bsd/bind/include/dns/code.h                                         |    99 +-
 external/bsd/bind/include/dns/enumtype.h                                     |     2 +
 external/bsd/bind/include/dns/rdatastruct.h                                  |    96 +-
 external/bsd/bind/include/isc/platform.h                                     |     4 +
 external/bsd/bind/lib/libbind9/shlib_version                                 |     4 +-
 external/bsd/bind/lib/libdns/Makefile                                        |     4 +-
 external/bsd/bind/lib/libdns/shlib_version                                   |     4 +-
 external/bsd/bind/lib/libisc/shlib_version                                   |     4 +-
 external/bsd/bind/lib/libisccc/shlib_version                                 |     4 +-
 external/bsd/bind/lib/libisccfg/shlib_version                                |     4 +-
 external/bsd/bind/lib/liblwres/shlib_version                                 |     4 +-
 220 files changed, 5851 insertions(+), 7222 deletions(-)

diffs (truncated from 25509 to 300 lines):

diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/bin/Makefile
--- a/external/bsd/bind/bin/Makefile    Sun Sep 11 18:38:02 2011 +0000
+++ b/external/bsd/bind/bin/Makefile    Sun Sep 11 18:55:24 2011 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.2 2009/10/25 00:18:38 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2011/09/11 18:55:24 christos Exp $
 
-SUBDIR= html dig host named nslookup nsupdate rndc dnssec check
+SUBDIR= html dig host named nslookup nsupdate rndc dnssec check tools
 
 .include "Makefile.inc"
 
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/bin/named/Makefile
--- a/external/bsd/bind/bin/named/Makefile      Sun Sep 11 18:38:02 2011 +0000
+++ b/external/bsd/bind/bin/named/Makefile      Sun Sep 11 18:55:24 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/06/20 07:43:57 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2011/09/11 18:55:24 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -21,7 +21,7 @@
 
 .PATH: ${DIST}/unix ${DIST}
 
-SRCS_UNIX=     os.c
+SRCS_UNIX=     os.c dlz_dlopen_driver.c
 SRCS=  builtin.c client.c config.c control.c controlconf.c \
        interfacemgr.c listenlist.c log.c logconf.c \
        lwaddr.c lwdclient.c lwderror.c \
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/bin/tools/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/bind/bin/tools/Makefile      Sun Sep 11 18:55:24 2011 +0000
@@ -0,0 +1,7 @@
+#      $NetBSD: Makefile,v 1.1 2011/09/11 18:55:24 christos Exp $
+
+SUBDIR= arpaname named-journalprint nsec3hash
+
+.include "Makefile.inc"
+
+.include <bsd.subdir.mk>
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/bin/tools/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/bind/bin/tools/Makefile.inc  Sun Sep 11 18:55:24 2011 +0000
@@ -0,0 +1,19 @@
+#      $NetBSD: Makefile.inc,v 1.1 2011/09/11 18:55:24 christos Exp $
+
+.include <bsd.own.mk>
+
+.include "${.CURDIR}/../../Makefile.inc"
+
+TOOLS=${IDIST}/bin/tools
+
+.PATH: ${TOOLS}
+
+PROG=${BASE}
+SRCS=${BASE}.c
+.if exists(${TOOLS}/${BASE}.8)
+BINDIR=/usr/sbin
+MAN=${BASE}.8
+.elif exists(${TOOLS}/${BASE}.1)
+BINDIR=/usr/bin
+MAN=${BASE}.1
+.endif
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/bin/tools/arpaname/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/bind/bin/tools/arpaname/Makefile     Sun Sep 11 18:55:24 2011 +0000
@@ -0,0 +1,7 @@
+#      $NetBSD: Makefile,v 1.1 2011/09/11 18:55:24 christos Exp $
+
+BASE=  ${.CURDIR:T}
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.include <bsd.prog.mk>
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/bin/tools/named-journalprint/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/bind/bin/tools/named-journalprint/Makefile   Sun Sep 11 18:55:24 2011 +0000
@@ -0,0 +1,7 @@
+#      $NetBSD: Makefile,v 1.1 2011/09/11 18:55:24 christos Exp $
+
+BASE=  ${.CURDIR:T}
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.include <bsd.prog.mk>
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/bin/tools/nsec3hash/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/bind/bin/tools/nsec3hash/Makefile    Sun Sep 11 18:55:24 2011 +0000
@@ -0,0 +1,7 @@
+#      $NetBSD: Makefile,v 1.1 2011/09/11 18:55:24 christos Exp $
+
+BASE=  ${.CURDIR:T}
+
+.include "${.CURDIR}/../Makefile.inc"
+
+.include <bsd.prog.mk>
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/dist/bin/check/named-checkconf.c
--- a/external/bsd/bind/dist/bin/check/named-checkconf.c        Sun Sep 11 18:38:02 2011 +0000
+++ b/external/bsd/bind/dist/bin/check/named-checkconf.c        Sun Sep 11 18:55:24 2011 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: named-checkconf.c,v 1.2 2011/02/16 03:46:44 christos Exp $     */
+/*     $NetBSD: named-checkconf.c,v 1.3 2011/09/11 18:55:25 christos Exp $     */
 
 /*
- * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: named-checkconf.c,v 1.54 2010-09-07 01:49:08 marka Exp */
+/* Id: named-checkconf.c,v 1.56 2011-03-12 04:59:46 tbox Exp */
 
 /*! \file */
 
@@ -192,7 +192,7 @@
                if (obj != NULL)
                        maps[i++] = obj;
        }
-       maps[i++] = NULL;
+       maps[i] = NULL;
 
        cfg_map_get(zoptions, "type", &typeobj);
        if (typeobj == NULL)
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/dist/bin/confgen/ddns-confgen.c
--- a/external/bsd/bind/dist/bin/confgen/ddns-confgen.c Sun Sep 11 18:38:02 2011 +0000
+++ b/external/bsd/bind/dist/bin/confgen/ddns-confgen.c Sun Sep 11 18:55:24 2011 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: ddns-confgen.c,v 1.2 2011/02/16 03:46:44 christos Exp $        */
+/*     $NetBSD: ddns-confgen.c,v 1.3 2011/09/11 18:55:25 christos Exp $        */
 
 /*
- * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: ddns-confgen.c,v 1.9 2009-09-29 15:06:05 fdupont Exp */
+/* Id: ddns-confgen.c,v 1.11 2011-03-12 04:59:46 tbox Exp */
 
 /*! \file */
 
@@ -162,6 +162,7 @@
 
        argc -= isc_commandline_index;
        argv += isc_commandline_index;
+       POST(argv);
 
        if (self_domain != NULL && zone != NULL)
                usage(1);       /* -s and -z cannot coexist */
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/dist/bin/confgen/rndc-confgen.c
--- a/external/bsd/bind/dist/bin/confgen/rndc-confgen.c Sun Sep 11 18:38:02 2011 +0000
+++ b/external/bsd/bind/dist/bin/confgen/rndc-confgen.c Sun Sep 11 18:55:24 2011 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: rndc-confgen.c,v 1.2 2011/02/16 03:46:44 christos Exp $        */
+/*     $NetBSD: rndc-confgen.c,v 1.3 2011/09/11 18:55:25 christos Exp $        */
 
 /*
- * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: rndc-confgen.c,v 1.5 2009-09-29 15:06:05 fdupont Exp */
+/* Id: rndc-confgen.c,v 1.7 2011-03-12 04:59:46 tbox Exp */
 
 /*! \file */
 
@@ -202,6 +202,7 @@
 
        argc -= isc_commandline_index;
        argv += isc_commandline_index;
+       POST(argv);
 
        if (argc > 0)
                usage(1);
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/dist/bin/dig/dig.1
--- a/external/bsd/bind/dist/bin/dig/dig.1      Sun Sep 11 18:38:02 2011 +0000
+++ b/external/bsd/bind/dist/bin/dig/dig.1      Sun Sep 11 18:55:24 2011 +0000
@@ -1,6 +1,6 @@
-.\"    $NetBSD: dig.1,v 1.2 2011/02/16 03:46:45 christos Exp $
+.\"    $NetBSD: dig.1,v 1.3 2011/09/11 18:55:25 christos Exp $
 .\"
-.\" Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000-2003 Internet Software Consortium.
 .\" 
 .\" Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" Id: dig.1,v 1.54 2010-03-05 01:14:15 tbox Exp
+.\" Id: dig.1,v 1.55 2011-03-06 01:14:19 tbox Exp
 .\"
 .hy 0
 .ad l
@@ -360,6 +360,24 @@
 Toggle the display of comment lines in the output. The default is to print comments.
 .RE
 .PP
+\fB+[no]rrcomments\fR
+.RS 4
+Toggle the display of per\-record comments in the output (for example, human\-readable key information about DNSKEY records). The default is not to print record comments unless multiline mode is 
active.
+.RE
+.PP
+\fB+split=W\fR
+.RS 4
+Split long hex\- or base64\-formatted fields in resource records into chunks of
+\fIW\fR
+characters (where
+\fIW\fR
+is rounded up to the nearest multiple of 4).
+\fI+nosplit\fR
+or
+\fI+split=0\fR
+causes fields not to be split at all. The default is 56 characters, or 44 characters when multiline mode is active.
+.RE
+.PP
 \fB+[no]stats\fR
 .RS 4
 This query option toggles the printing of statistics: when the query was made, the size of the reply and so on. The default behavior is to print the query statistics.
@@ -569,7 +587,7 @@
 .PP
 There are probably too many query options.
 .SH "COPYRIGHT"
-Copyright \(co 2004\-2010 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2004\-2011 Internet Systems Consortium, Inc. ("ISC")
 .br
 Copyright \(co 2000\-2003 Internet Software Consortium.
 .br
diff -r ecd145d0b5e3 -r b665f4eb338f external/bsd/bind/dist/bin/dig/dig.c
--- a/external/bsd/bind/dist/bin/dig/dig.c      Sun Sep 11 18:38:02 2011 +0000
+++ b/external/bsd/bind/dist/bin/dig/dig.c      Sun Sep 11 18:55:24 2011 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: dig.c,v 1.2 2011/02/16 03:46:45 christos Exp $ */
+/*     $NetBSD: dig.c,v 1.3 2011/09/11 18:55:25 christos Exp $ */
 
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: dig.c,v 1.237 2010-05-13 00:40:46 marka Exp */
+/* Id: dig.c,v 1.242 2011-03-11 06:11:20 marka Exp */
 
 /*! \file */
 
@@ -46,8 +46,6 @@
 #include <dns/result.h>
 #include <dns/tsig.h>
 
-#include <bind9/getaddresses.h>
-
 #include <dig/dig.h>
 
 #define ADD_STRING(b, s) {                             \
@@ -71,7 +69,8 @@
 static isc_boolean_t short_form = ISC_FALSE, printcmd = ISC_TRUE,
        ip6_int = ISC_FALSE, plusquest = ISC_FALSE, pluscomm = ISC_FALSE,
        multiline = ISC_FALSE, nottl = ISC_FALSE, noclass = ISC_FALSE,
-       onesoa = ISC_FALSE;
+       onesoa = ISC_FALSE, rrcomments = ISC_FALSE;
+static isc_uint32_t splitwidth = 0xffffffff;
 
 /*% opcode text */
 static const char * const opcodetext[] = {
@@ -205,6 +204,8 @@
 "                 +[no]cl             (Control display of class in records)\n"
 "                 +[no]cmd            (Control display of command line)\n"
 "                 +[no]comments       (Control display of comment lines)\n"
+"                 +[no]rrcomments     (Control display of per-record "
+                                      "comments)\n"
 "                 +[no]question       (Control display of question)\n"
 "                 +[no]answer         (Control display of answer)\n"
 "                 +[no]authority      (Control display of authority)\n"
@@ -227,6 +228,7 @@
 "                 +[no]topdown        (Do DNSSEC validation top down mode)\n"
 #endif
 #endif
+"                 +[no]split=##       (Split hex/base64 fields into chunks)\n"
 "                 +[no]multiline      (Print records in an expanded format)\n"
 "                 +[no]onesoa         (AXFR prints only one soa record)\n"



Home | Main Index | Thread Index | Old Index