Source-Changes-HG archive

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

[src/trunk]: src/external/mpl/bind Merge conflicts



details:   https://anonhg.NetBSD.org/src/rev/c7f766e879c2
branches:  trunk
changeset: 1010395:c7f766e879c2
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 24 19:46:10 2020 +0000

description:
Merge conflicts

diffstat:

 external/mpl/bind/Makefile.inc                                                     |     9 +-
 external/mpl/bind/bind2netbsd                                                      |    18 +-
 external/mpl/bind/dist/Makefile.in                                                 |    29 +-
 external/mpl/bind/dist/bin/check/check-tool.c                                      |   296 +-
 external/mpl/bind/dist/bin/check/check-tool.h                                      |    13 +-
 external/mpl/bind/dist/bin/check/named-checkconf.8                                 |    11 +-
 external/mpl/bind/dist/bin/check/named-checkconf.c                                 |   241 +-
 external/mpl/bind/dist/bin/check/named-checkzone.8                                 |     6 +-
 external/mpl/bind/dist/bin/check/named-checkzone.c                                 |   141 +-
 external/mpl/bind/dist/bin/confgen/ddns-confgen.8                                  |     6 +-
 external/mpl/bind/dist/bin/confgen/ddns-confgen.c                                  |   104 +-
 external/mpl/bind/dist/bin/confgen/include/confgen/os.h                            |    11 +-
 external/mpl/bind/dist/bin/confgen/keygen.c                                        |   155 +-
 external/mpl/bind/dist/bin/confgen/keygen.h                                        |    27 +-
 external/mpl/bind/dist/bin/confgen/rndc-confgen.8                                  |     6 +-
 external/mpl/bind/dist/bin/confgen/rndc-confgen.c                                  |    69 +-
 external/mpl/bind/dist/bin/confgen/unix/os.c                                       |    19 +-
 external/mpl/bind/dist/bin/confgen/util.c                                          |    10 +-
 external/mpl/bind/dist/bin/confgen/util.h                                          |    20 +-
 external/mpl/bind/dist/bin/confgen/win32/os.c                                      |    19 +-
 external/mpl/bind/dist/bin/delv/delv.1                                             |    46 +-
 external/mpl/bind/dist/bin/delv/delv.c                                             |  1097 +-
 external/mpl/bind/dist/bin/dig/dig.1                                               |    25 +-
 external/mpl/bind/dist/bin/dig/dig.c                                               |  1402 +-
 external/mpl/bind/dist/bin/dig/dighost.c                                           |  1403 +-
 external/mpl/bind/dist/bin/dig/host.1                                              |    13 +-
 external/mpl/bind/dist/bin/dig/host.c                                              |   475 +-
 external/mpl/bind/dist/bin/dig/include/dig/dig.h                                   |   338 +-
 external/mpl/bind/dist/bin/dig/nslookup.1                                          |    11 +-
 external/mpl/bind/dist/bin/dig/nslookup.c                                          |   453 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-cds.8                                     |     8 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-cds.c                                     |   333 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.8                               |    37 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c                               |   325 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-importkey.8                               |     6 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-importkey.c                               |   251 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.8                            |     8 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-keyfromlabel.c                            |   454 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-keygen.8                                  |    33 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-keygen.c                                  |  1387 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-revoke.8                                  |     6 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-revoke.c                                  |   133 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-settime.8                                 |    61 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-settime.c                                 |   890 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-signzone.8                                |    22 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-signzone.c                                |  1652 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-verify.8                                  |    15 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-verify.c                                  |   118 +-
 external/mpl/bind/dist/bin/dnssec/dnssectool.c                                     |   269 +-
 external/mpl/bind/dist/bin/dnssec/dnssectool.h                                     |    54 +-
 external/mpl/bind/dist/bin/named/bind9.xsl.h                                       |   322 +-
 external/mpl/bind/dist/bin/named/builtin.c                                         |   322 +-
 external/mpl/bind/dist/bin/named/config.c                                          |   378 +-
 external/mpl/bind/dist/bin/named/control.c                                         |    70 +-
 external/mpl/bind/dist/bin/named/controlconf.c                                     |   594 +-
 external/mpl/bind/dist/bin/named/fuzz.c                                            |   256 +-
 external/mpl/bind/dist/bin/named/geoip.c                                           |   149 +-
 external/mpl/bind/dist/bin/named/include/dlz/dlz_dlopen_driver.h                   |     5 +-
 external/mpl/bind/dist/bin/named/include/named/builtin.h                           |     8 +-
 external/mpl/bind/dist/bin/named/include/named/config.h                            |    31 +-
 external/mpl/bind/dist/bin/named/include/named/control.h                           |    93 +-
 external/mpl/bind/dist/bin/named/include/named/geoip.h                             |     5 +-
 external/mpl/bind/dist/bin/named/include/named/globals.h                           |   168 +-
 external/mpl/bind/dist/bin/named/include/named/log.h                               |    18 +-
 external/mpl/bind/dist/bin/named/include/named/logconf.h                           |     3 +-
 external/mpl/bind/dist/bin/named/include/named/main.h                              |     6 +-
 external/mpl/bind/dist/bin/named/include/named/server.h                            |   132 +-
 external/mpl/bind/dist/bin/named/include/named/smf_globals.h                       |    18 +-
 external/mpl/bind/dist/bin/named/include/named/statschannel.h                      |    10 +-
 external/mpl/bind/dist/bin/named/include/named/tkeyconf.h                          |     4 +-
 external/mpl/bind/dist/bin/named/include/named/tsigconf.h                          |     4 +-
 external/mpl/bind/dist/bin/named/include/named/types.h                             |    31 +-
 external/mpl/bind/dist/bin/named/include/named/zoneconf.h                          |    17 +-
 external/mpl/bind/dist/bin/named/log.c                                             |   144 +-
 external/mpl/bind/dist/bin/named/logconf.c                                         |   154 +-
 external/mpl/bind/dist/bin/named/main.c                                            |   719 +-
 external/mpl/bind/dist/bin/named/named.8                                           |     8 +-
 external/mpl/bind/dist/bin/named/named.conf.5                                      |   178 +-
 external/mpl/bind/dist/bin/named/server.c                                          |  6288 +++---
 external/mpl/bind/dist/bin/named/statschannel.c                                    |  2706 +-
 external/mpl/bind/dist/bin/named/tkeyconf.c                                        |    54 +-
 external/mpl/bind/dist/bin/named/tsigconf.c                                        |    76 +-
 external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c                          |   295 +-
 external/mpl/bind/dist/bin/named/unix/os.c                                         |   270 +-
 external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c                         |   292 +-
 external/mpl/bind/dist/bin/named/win32/include/named/ntservice.h                   |    13 +-
 external/mpl/bind/dist/bin/named/win32/ntservice.c                                 |    40 +-
 external/mpl/bind/dist/bin/named/win32/os.c                                        |   127 +-
 external/mpl/bind/dist/bin/named/zoneconf.c                                        |   720 +-
 external/mpl/bind/dist/bin/nsupdate/nsupdate.1                                     |     6 +-
 external/mpl/bind/dist/bin/nsupdate/nsupdate.c                                     |  1030 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-destroy.8                                 |     6 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-destroy.c                                 |    92 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-keygen.8                                  |     6 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-keygen.c                                  |   209 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-list.8                                    |     6 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-list.c                                    |    99 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-tokens.8                                  |     6 +-
 external/mpl/bind/dist/bin/pkcs11/pkcs11-tokens.c                                  |    35 +-
 external/mpl/bind/dist/bin/plugins/filter-aaaa.8                                   |     6 +-
 external/mpl/bind/dist/bin/plugins/filter-aaaa.c                                   |   228 +-
 external/mpl/bind/dist/bin/python/dnssec-checkds.8                                 |    22 +-
 external/mpl/bind/dist/bin/python/dnssec-coverage.8                                |     6 +-
 external/mpl/bind/dist/bin/python/dnssec-keymgr.8                                  |     6 +-
 external/mpl/bind/dist/bin/rndc/include/rndc/os.h                                  |    11 +-
 external/mpl/bind/dist/bin/rndc/rndc.8                                             |    35 +-
 external/mpl/bind/dist/bin/rndc/rndc.c                                             |   377 +-
 external/mpl/bind/dist/bin/rndc/rndc.conf.5                                        |     6 +-
 external/mpl/bind/dist/bin/rndc/util.c                                             |    10 +-
 external/mpl/bind/dist/bin/rndc/util.h                                             |    22 +-
 external/mpl/bind/dist/bin/tests/cfg_test.c                                        |    70 +-
 external/mpl/bind/dist/bin/tests/makejournal.c                                     |    74 +-
 external/mpl/bind/dist/bin/tests/optional/adb_test.c                               |   128 +-
 external/mpl/bind/dist/bin/tests/optional/backtrace_test.c                         |    21 +-
 external/mpl/bind/dist/bin/tests/optional/byaddr_test.c                            |    79 +-
 external/mpl/bind/dist/bin/tests/optional/byname_test.c                            |    99 +-
 external/mpl/bind/dist/bin/tests/optional/db_test.c                                |   371 +-
 external/mpl/bind/dist/bin/tests/optional/fsaccess_test.c                          |    17 +-
 external/mpl/bind/dist/bin/tests/optional/gsstest.c                                |   164 +-
 external/mpl/bind/dist/bin/tests/optional/inter_test.c                             |    39 +-
 external/mpl/bind/dist/bin/tests/optional/lex_test.c                               |    38 +-
 external/mpl/bind/dist/bin/tests/optional/lfsr_test.c                              |    16 +-
 external/mpl/bind/dist/bin/tests/optional/log_test.c                               |   118 +-
 external/mpl/bind/dist/bin/tests/optional/master_test.c                            |    31 +-
 external/mpl/bind/dist/bin/tests/optional/mempool_test.c                           |    10 +-
 external/mpl/bind/dist/bin/tests/optional/name_test.c                              |   121 +-
 external/mpl/bind/dist/bin/tests/optional/nsecify.c                                |    58 +-
 external/mpl/bind/dist/bin/tests/optional/ratelimiter_test.c                       |    66 +-
 external/mpl/bind/dist/bin/tests/optional/rbt_test.c                               |   128 +-
 external/mpl/bind/dist/bin/tests/optional/rwlock_test.c                            |    60 +-
 external/mpl/bind/dist/bin/tests/optional/serial_test.c                            |    19 +-
 external/mpl/bind/dist/bin/tests/optional/shutdown_test.c                          |    71 +-
 external/mpl/bind/dist/bin/tests/optional/sig0_test.c                              |    42 +-
 external/mpl/bind/dist/bin/tests/optional/sock_test.c                              |   104 +-
 external/mpl/bind/dist/bin/tests/optional/sym_test.c                               |    27 +-
 external/mpl/bind/dist/bin/tests/optional/task_test.c                              |    40 +-
 external/mpl/bind/dist/bin/tests/optional/timer_test.c                             |    63 +-
 external/mpl/bind/dist/bin/tests/optional/zone_test.c                              |   113 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/create.c                        |   105 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/find.c                          |    75 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/genrsa.c                        |   132 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/login.c                         |    96 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/privrsa.c                       |   262 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/pubrsa.c                        |   133 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/session.c                       |    76 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sha1.c                          |    63 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sign.c                          |   259 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/verify.c                        |   126 +-
 external/mpl/bind/dist/bin/tests/system/checkconf/check-dlv-ksk-key.conf           |    20 -
 external/mpl/bind/dist/bin/tests/system/checkconf/dnssec.1                         |     3 +-
 external/mpl/bind/dist/bin/tests/system/checkconf/dnssec.2                         |     6 +-
 external/mpl/bind/dist/bin/tests/system/checkconf/dnssec.3                         |     9 +-
 external/mpl/bind/dist/bin/tests/system/checkconf/good-dlv-dlv.example.com.conf    |    14 -
 external/mpl/bind/dist/bin/tests/system/checkconf/setup.sh                         |    15 -
 external/mpl/bind/dist/bin/tests/system/checkconf/warn-duplicate-key.conf          |    34 -
 external/mpl/bind/dist/bin/tests/system/checkconf/warn-duplicate-root-key.conf     |    34 -
 external/mpl/bind/dist/bin/tests/system/checkconf/warn-validation-auto-key.conf    |    24 -
 external/mpl/bind/dist/bin/tests/system/checkds/missing.example.dlv.example.dlv.db |     2 -
 external/mpl/bind/dist/bin/tests/system/checkds/ok.example.dlv.example.dlv.db      |     2 -
 external/mpl/bind/dist/bin/tests/system/checkds/setup.sh                           |    15 -
 external/mpl/bind/dist/bin/tests/system/checkds/wrong.example.dlv.example.dlv.db   |     2 -
 external/mpl/bind/dist/bin/tests/system/clean.sh                                   |    53 -
 external/mpl/bind/dist/bin/tests/system/cookie/bad-cookie-badsha1.conf             |    15 -
 external/mpl/bind/dist/bin/tests/system/cookie/bad-cookie-badsha256.conf           |    15 -
 external/mpl/bind/dist/bin/tests/system/cookie/good-cookie-sha1.conf               |    15 -
 external/mpl/bind/dist/bin/tests/system/cookie/good-cookie-sha256.conf             |    15 -
 external/mpl/bind/dist/bin/tests/system/dialup/setup.sh                            |    13 -
 external/mpl/bind/dist/bin/tests/system/dlv/clean.sh                               |    45 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns1/named.conf.in                      |    26 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns1/root.db.in                         |    26 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns1/rootservers.utld.db                |    13 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns1/sign.sh                            |    38 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns2/druz.db.in                         |    47 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns2/hints                              |    11 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns2/named.conf.in                      |    38 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns2/sign.sh                            |    37 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns2/utld.db                            |    61 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns3/child.db.in                        |    17 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns3/dlv.db.in                          |    13 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns3/hints                              |    11 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns3/named.conf.in                      |   142 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns3/sign.sh                            |   397 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns4/child.db                           |    34 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns4/hints                              |    11 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns4/named.conf.in                      |    27 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns5/hints                              |    11 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns5/named.conf.in                      |    31 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns5/rndc.conf                          |    20 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns6/child.db.in                        |    15 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns6/hints                              |    11 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns6/named.conf.in                      |    41 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns6/sign.sh                            |   251 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns7/hints                              |    12 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns7/named.conf.in                      |    31 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns8/hints                              |    12 -
 external/mpl/bind/dist/bin/tests/system/dlv/ns8/named.conf.in                      |    32 -
 external/mpl/bind/dist/bin/tests/system/dlv/setup.sh                               |    26 -
 external/mpl/bind/dist/bin/tests/system/dlv/tests.sh                               |   111 -
 external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c                       |   294 +-
 external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.h                       |     5 +-
 external/mpl/bind/dist/bin/tests/system/dns64/conf/warn1.conf                      |     3 -
 external/mpl/bind/dist/bin/tests/system/dns64/conf/warn2.conf                      |     3 -
 external/mpl/bind/dist/bin/tests/system/dns64/conf/warn3.conf                      |     3 -
 external/mpl/bind/dist/bin/tests/system/dns64/conf/warn4.conf                      |     3 -
 external/mpl/bind/dist/bin/tests/system/dns64/conf/warn5.conf                      |     3 -
 external/mpl/bind/dist/bin/tests/system/dns64/conf/warn6.conf                      |     3 -
 external/mpl/bind/dist/bin/tests/system/dns64/conf/warn7.conf                      |     3 -
 external/mpl/bind/dist/bin/tests/system/dns64/conf/warn8.conf                      |     3 -
 external/mpl/bind/dist/bin/tests/system/dnssec/ns2/dlv.db.in                       |    19 -
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/db.c                          |   230 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/db.h                          |    15 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/driver.c                      |    30 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/instance.c                    |    80 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/instance.h                    |    34 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/lock.c                        |    14 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/log.c                         |     6 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/log.h                         |    12 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/syncptr.c                     |    75 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/syncptr.h                     |    14 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/util.h                        |    61 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/zone.c                        |    58 +-
 external/mpl/bind/dist/bin/tests/system/dyndb/driver/zone.h                        |    17 +-
 external/mpl/bind/dist/bin/tests/system/feature-test.c                             |    74 +-
 external/mpl/bind/dist/bin/tests/system/fetchlimit/ns3/named.args                  |     2 -
 external/mpl/bind/dist/bin/tests/system/geoip/clean.sh                             |    20 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIP.csv                       |     8 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIP.dat                       |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPASNum.csv                  |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPASNum.dat                  |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPASNumv6.csv                |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPASNumv6.dat                |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPCity.csv                   |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPCity.dat                   |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPCityv6.csv                 |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPCityv6.dat                 |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPDomain.csv                 |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPDomain.dat                 |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPISP.csv                    |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPISP.dat                    |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPNetSpeed.csv               |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPNetSpeed.dat               |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPOrg.csv                    |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPOrg.dat                    |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPRegion.csv                 |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPRegion.dat                 |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPv6.csv                     |     7 -
 external/mpl/bind/dist/bin/tests/system/geoip/data/GeoIPv6.dat                     |   Bin 
 external/mpl/bind/dist/bin/tests/system/geoip/data/README                          |    34 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/example.db.in                    |    19 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named1.conf.in                   |   106 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named10.conf.in                  |    98 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named11.conf.in                  |    98 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named12.conf.in                  |    74 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named13.conf.in                  |    39 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named14.conf.in                  |   106 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named15.conf.in                  |    49 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named16.conf.in                  |    49 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named2.conf.in                   |    98 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named3.conf.in                   |    98 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named4.conf.in                   |    90 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named5.conf.in                   |    98 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named6.conf.in                   |    98 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named7.conf.in                   |    98 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named8.conf.in                   |    98 -
 external/mpl/bind/dist/bin/tests/system/geoip/ns2/named9.conf.in                   |    98 -
 external/mpl/bind/dist/bin/tests/system/geoip/options.conf                         |    37 -
 external/mpl/bind/dist/bin/tests/system/geoip/prereq.sh                            |    19 -
 external/mpl/bind/dist/bin/tests/system/geoip/setup.sh                             |    25 -
 external/mpl/bind/dist/bin/tests/system/geoip/tests.sh                             |   335 -
 external/mpl/bind/dist/bin/tests/system/pipelined/ns3/named.args                   |     1 -
 external/mpl/bind/dist/bin/tests/system/pipelined/pipequeries.c                    |    97 +-
 external/mpl/bind/dist/bin/tests/system/pkcs11/ns1/named.conf                      |    52 -
 external/mpl/bind/dist/bin/tests/system/pkcs11/prereq.sh                           |    26 -
 external/mpl/bind/dist/bin/tests/system/resolver/ns7/named.args                    |     2 -
 external/mpl/bind/dist/bin/tests/system/rndc/gencheck.c                            |    40 +-
 external/mpl/bind/dist/bin/tests/system/rpz/dnsrps.c                               |    60 +-
 external/mpl/bind/dist/bin/tests/system/rrchecker/setup.sh                         |    15 -
 external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c                    |    83 +-
 external/mpl/bind/dist/bin/tests/system/smartsign/setup.sh                         |    15 -
 external/mpl/bind/dist/bin/tests/system/tkey/keycreate.c                           |    73 +-
 external/mpl/bind/dist/bin/tests/system/tkey/keydelete.c                           |    61 +-
 external/mpl/bind/dist/bin/tests/virtual-time/Makefile.in                          |    38 -
 external/mpl/bind/dist/bin/tests/virtual-time/README                               |    18 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-ksk/clean.sh                |    20 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-ksk/ns1/example.db.in       |    21 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-ksk/ns1/named.conf          |    50 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-ksk/ns1/root.db             |    23 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-ksk/ns1/sign.sh             |    30 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh             |    17 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-ksk/setup.sh                |    17 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-ksk/tests.sh                |   102 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-zsk/clean.sh                |    20 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-zsk/ns1/example.db.in       |    21 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-zsk/ns1/named.conf          |    50 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-zsk/ns1/root.db             |    23 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-zsk/ns1/sign.sh             |    30 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh             |    17 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-zsk/setup.sh                |    17 -
 external/mpl/bind/dist/bin/tests/virtual-time/autosign-zsk/tests.sh                |    93 -
 external/mpl/bind/dist/bin/tests/virtual-time/cleanall.sh                          |    30 -
 external/mpl/bind/dist/bin/tests/virtual-time/common/controls.conf                 |    20 -
 external/mpl/bind/dist/bin/tests/virtual-time/common/rndc.conf                     |    19 -
 external/mpl/bind/dist/bin/tests/virtual-time/common/root.hint                     |    12 -
 external/mpl/bind/dist/bin/tests/virtual-time/conf.sh.in                           |    42 -
 external/mpl/bind/dist/bin/tests/virtual-time/run.sh                               |   102 -
 external/mpl/bind/dist/bin/tests/virtual-time/runall.sh                            |    33 -
 external/mpl/bind/dist/bin/tests/virtual-time/setup.sh                             |    30 -
 external/mpl/bind/dist/bin/tests/virtual-time/slave/clean.sh                       |    17 -
 external/mpl/bind/dist/bin/tests/virtual-time/slave/ns1/example.db.in              |    21 -
 external/mpl/bind/dist/bin/tests/virtual-time/slave/ns1/named.conf                 |    45 -
 external/mpl/bind/dist/bin/tests/virtual-time/slave/ns1/root.db                    |    23 -
 external/mpl/bind/dist/bin/tests/virtual-time/slave/ns1/wrap.sh                    |    17 -
 external/mpl/bind/dist/bin/tests/virtual-time/slave/setup.sh                       |    11 -
 external/mpl/bind/dist/bin/tests/virtual-time/slave/tests.sh                       |    42 -
 external/mpl/bind/dist/bin/tests/virtual-time/start.pl                             |   177 -
 external/mpl/bind/dist/bin/tests/virtual-time/start.sh                             |    13 -
 external/mpl/bind/dist/bin/tests/virtual-time/stop.pl                              |   174 -
 external/mpl/bind/dist/bin/tests/virtual-time/stop.sh                              |    14 -
 external/mpl/bind/dist/bin/tests/virtual-time/testsock.pl                          |    43 -
 external/mpl/bind/dist/bin/tests/virtual-time/vtwrapper.c                          |   304 -
 external/mpl/bind/dist/bin/tests/wire_test.c                                       |   156 +-
 external/mpl/bind/dist/bin/tools/arpaname.1                                        |     6 +-
 external/mpl/bind/dist/bin/tools/arpaname.c                                        |    18 +-
 external/mpl/bind/dist/bin/tools/dnstap-read.1                                     |     6 +-
 external/mpl/bind/dist/bin/tools/dnstap-read.c                                     |   188 +-
 external/mpl/bind/dist/bin/tools/mdig.1                                            |    11 +-
 external/mpl/bind/dist/bin/tools/mdig.c                                            |   993 +-
 external/mpl/bind/dist/bin/tools/named-journalprint.8                              |     6 +-
 external/mpl/bind/dist/bin/tools/named-journalprint.c                              |    30 +-
 external/mpl/bind/dist/bin/tools/named-nzd2nzf.8                                   |     6 +-
 external/mpl/bind/dist/bin/tools/named-nzd2nzf.c                                   |    23 +-
 external/mpl/bind/dist/bin/tools/named-rrchecker.1                                 |     6 +-
 external/mpl/bind/dist/bin/tools/named-rrchecker.c                                 |    79 +-
 external/mpl/bind/dist/bin/tools/nsec3hash.8                                       |     6 +-
 external/mpl/bind/dist/bin/tools/nsec3hash.c                                       |    64 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/AccountInfo.h                         |    33 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/BINDInstall.h                         |    35 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/BINDInstallDlg.h                      |   179 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/DirBrowse.h                           |    58 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/StdAfx.h                              |    38 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/VersionInfo.h                         |   107 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/resource.h                            |   206 +-
 external/mpl/bind/dist/bind.keys.h                                                 |    48 +-
 external/mpl/bind/dist/config.h.in                                                 |    68 +-
 external/mpl/bind/dist/configure                                                   |  3863 +++-
 external/mpl/bind/dist/contrib/dlz/bin/dlzbdb/dlzbdb.c                             |   547 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_bdb_driver.c                        |   336 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_bdbhpt_driver.c                     |   378 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_drivers.c                           |    88 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_filesystem_driver.c                 |   469 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_ldap_driver.c                       |   484 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_mysql_driver.c                      |   371 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_odbc_driver.c                       |   574 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_postgres_driver.c                   |   400 +-
 external/mpl/bind/dist/contrib/dlz/drivers/dlz_stub_driver.c                       |   148 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/dlz_bdb_driver.h            |     4 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/dlz_bdbhpt_driver.h         |     4 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/dlz_drivers.h               |     3 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/dlz_filesystem_driver.h     |     4 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/dlz_ldap_driver.h           |     4 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/dlz_mysql_driver.h          |     4 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/dlz_odbc_driver.h           |     4 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/dlz_postgres_driver.h       |     4 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/dlz_stub_driver.h           |     4 +-
 external/mpl/bind/dist/contrib/dlz/drivers/include/dlz/sdlz_helper.h               |    59 +-
 external/mpl/bind/dist/contrib/dlz/drivers/sdlz_helper.c                           |   167 +-
 external/mpl/bind/dist/contrib/dlz/example/dlz_example.c                           |   360 +-
 external/mpl/bind/dist/contrib/dlz/example/win32/DLLMain.c                         |    54 +-
 external/mpl/bind/dist/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c             |   493 +-
 external/mpl/bind/dist/contrib/dlz/modules/common/dlz_dbi.c                        |   193 +-
 external/mpl/bind/dist/contrib/dlz/modules/filesystem/dir.c                        |    31 +-
 external/mpl/bind/dist/contrib/dlz/modules/filesystem/dir.h                        |    16 +-
 external/mpl/bind/dist/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c     |   423 +-
 external/mpl/bind/dist/contrib/dlz/modules/include/dlz_dbi.h                       |    50 +-
 external/mpl/bind/dist/contrib/dlz/modules/include/dlz_list.h                      |    42 +-
 external/mpl/bind/dist/contrib/dlz/modules/include/dlz_minimal.h                   |   151 +-
 external/mpl/bind/dist/contrib/dlz/modules/include/dlz_pthread.h                   |    20 +-
 external/mpl/bind/dist/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c                 |   598 +-
 external/mpl/bind/dist/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c               |   486 +-
 external/mpl/bind/dist/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c             |   622 +-
 external/mpl/bind/dist/contrib/dlz/modules/perl/dlz_perl_driver.c                  |   309 +-
 external/mpl/bind/dist/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c           |   421 +-
 external/mpl/bind/dist/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c         |   341 +-
 external/mpl/bind/dist/doc/arm/Bv9ARM.pdf                                          |   Bin 
 external/mpl/bind/dist/doc/arm/notes-9.14.0.xml                                    |   486 -
 external/mpl/bind/dist/doc/arm/notes-9.14.1.xml                                    |    62 -
 external/mpl/bind/dist/doc/arm/notes-9.14.2.xml                                    |    36 -
 external/mpl/bind/dist/doc/arm/notes-9.14.3.xml                                    |    42 -
 external/mpl/bind/dist/doc/arm/notes-9.14.4.xml                                    |    73 -
 external/mpl/bind/dist/doc/arm/notes-9.14.5.xml                                    |    86 -
 external/mpl/bind/dist/doc/arm/notes-9.14.6.xml                                    |    26 -
 external/mpl/bind/dist/doc/arm/notes-9.14.7.xml                                    |    34 -
 external/mpl/bind/dist/doc/arm/notes-9.14.8.xml                                    |    50 -
 external/mpl/bind/dist/fuzz/dns_name_fromtext_target.c                             |    40 +-
 external/mpl/bind/dist/fuzz/dns_rdata_fromwire_text.c                              |    57 +-
 external/mpl/bind/dist/fuzz/fuzz.h                                                 |    12 +-
 external/mpl/bind/dist/fuzz/main.c                                                 |    53 +-
 external/mpl/bind/dist/isc-config.sh.1                                             |    96 -
 external/mpl/bind/dist/isc-config.sh.docbook                                       |   151 -
 external/mpl/bind/dist/isc-config.sh.html                                          |   126 -
 external/mpl/bind/dist/isc-config.sh.in                                            |   156 -
 external/mpl/bind/dist/lib/bind9/check.c                                           |  2967 ++-
 external/mpl/bind/dist/lib/bind9/getaddresses.c                                    |    66 +-
 external/mpl/bind/dist/lib/bind9/include/bind9/check.h                             |     3 +-
 external/mpl/bind/dist/lib/bind9/include/bind9/getaddresses.h                      |    10 +-
 external/mpl/bind/dist/lib/bind9/include/bind9/version.h                           |     3 +-
 external/mpl/bind/dist/lib/bind9/version.c                                         |     4 +-
 external/mpl/bind/dist/lib/bind9/win32/DLLMain.c                                   |    12 +-
 external/mpl/bind/dist/lib/bind9/win32/version.c                                   |     4 +-
 external/mpl/bind/dist/lib/dns/acl.c                                               |   223 +-
 external/mpl/bind/dist/lib/dns/adb.c                                               |  1994 +-
 external/mpl/bind/dist/lib/dns/badcache.c                                          |   342 +-
 external/mpl/bind/dist/lib/dns/byaddr.c                                            |    87 +-
 external/mpl/bind/dist/lib/dns/cache.c                                             |   724 +-
 external/mpl/bind/dist/lib/dns/callbacks.c                                         |    17 +-
 external/mpl/bind/dist/lib/dns/catz.c                                              |   743 +-
 external/mpl/bind/dist/lib/dns/client.c                                            |  1356 +-
 external/mpl/bind/dist/lib/dns/clientinfo.c                                        |     7 +-
 external/mpl/bind/dist/lib/dns/compress.c                                          |   267 +-
 external/mpl/bind/dist/lib/dns/db.c                                                |   371 +-
 external/mpl/bind/dist/lib/dns/dbiterator.c                                        |     9 +-
 external/mpl/bind/dist/lib/dns/dbtable.c                                           |    94 +-
 external/mpl/bind/dist/lib/dns/diff.c                                              |   208 +-
 external/mpl/bind/dist/lib/dns/dispatch.c                                          |  1401 +-
 external/mpl/bind/dist/lib/dns/dlz.c                                               |   159 +-
 external/mpl/bind/dist/lib/dns/dns64.c                                             |   162 +-
 external/mpl/bind/dist/lib/dns/dnsrps.c                                            |   286 +-
 external/mpl/bind/dist/lib/dns/dnssec.c                                            |  1139 +-
 external/mpl/bind/dist/lib/dns/dnstap.c                                            |   468 +-
 external/mpl/bind/dist/lib/dns/ds.c                                                |    85 +-
 external/mpl/bind/dist/lib/dns/dst_api.c                                           |  1643 +-
 external/mpl/bind/dist/lib/dns/dst_internal.h                                      |   173 +-
 external/mpl/bind/dist/lib/dns/dst_openssl.h                                       |    33 +-
 external/mpl/bind/dist/lib/dns/dst_parse.c                                         |   337 +-
 external/mpl/bind/dist/lib/dns/dst_parse.h                                         |    79 +-
 external/mpl/bind/dist/lib/dns/dst_pkcs11.h                                        |    23 +-
 external/mpl/bind/dist/lib/dns/dst_result.c                                        |    64 +-
 external/mpl/bind/dist/lib/dns/dyndb.c                                             |   183 +-
 external/mpl/bind/dist/lib/dns/ecdb.c                                              |   404 +-
 external/mpl/bind/dist/lib/dns/ecs.c                                               |     4 +-
 external/mpl/bind/dist/lib/dns/fixedname.c                                         |     4 +-
 external/mpl/bind/dist/lib/dns/forward.c                                           |    84 +-
 external/mpl/bind/dist/lib/dns/gen-unix.h                                          |    30 +-
 external/mpl/bind/dist/lib/dns/gen-win32.h                                         |   100 +-
 external/mpl/bind/dist/lib/dns/gen.c                                               |   409 +-
 external/mpl/bind/dist/lib/dns/geoip.c                                             |   831 -
 external/mpl/bind/dist/lib/dns/geoip2.c                                            |   201 +-
 external/mpl/bind/dist/lib/dns/gssapi_link.c                                       |   102 +-
 external/mpl/bind/dist/lib/dns/gssapictx.c                                         |   292 +-
 external/mpl/bind/dist/lib/dns/hmac_link.c                                         |   234 +-
 external/mpl/bind/dist/lib/dns/include/dns/acl.h                                   |    82 +-
 external/mpl/bind/dist/lib/dns/include/dns/adb.h                                   |   125 +-
 external/mpl/bind/dist/lib/dns/include/dns/badcache.h                              |    13 +-
 external/mpl/bind/dist/lib/dns/include/dns/bit.h                                   |     9 +-
 external/mpl/bind/dist/lib/dns/include/dns/byaddr.h                                |    13 +-
 external/mpl/bind/dist/lib/dns/include/dns/cache.h                                 |    32 +-
 external/mpl/bind/dist/lib/dns/include/dns/callbacks.h                             |    21 +-
 external/mpl/bind/dist/lib/dns/include/dns/catz.h                                  |    30 +-
 external/mpl/bind/dist/lib/dns/include/dns/cert.h                                  |     3 +-
 external/mpl/bind/dist/lib/dns/include/dns/client.h                                |   107 +-
 external/mpl/bind/dist/lib/dns/include/dns/clientinfo.h                            |    33 +-
 external/mpl/bind/dist/lib/dns/include/dns/compress.h                              |    64 +-
 external/mpl/bind/dist/lib/dns/include/dns/db.h                                    |   407 +-
 external/mpl/bind/dist/lib/dns/include/dns/dbiterator.h                            |    66 +-
 external/mpl/bind/dist/lib/dns/include/dns/dbtable.h                               |     9 +-
 external/mpl/bind/dist/lib/dns/include/dns/diff.h                                  |    56 +-
 external/mpl/bind/dist/lib/dns/include/dns/dispatch.h                              |    97 +-
 external/mpl/bind/dist/lib/dns/include/dns/dlz.h                                   |   136 +-
 external/mpl/bind/dist/lib/dns/include/dns/dlz_dlopen.h                            |   111 +-
 external/mpl/bind/dist/lib/dns/include/dns/dns64.h                                 |    35 +-
 external/mpl/bind/dist/lib/dns/include/dns/dnsrps.h                                |    54 +-
 external/mpl/bind/dist/lib/dns/include/dns/dnssec.h                                |    96 +-
 external/mpl/bind/dist/lib/dns/include/dns/dnstap.h                                |    50 +-
 external/mpl/bind/dist/lib/dns/include/dns/ds.h                                    |    26 +-
 external/mpl/bind/dist/lib/dns/include/dns/dsdigest.h                              |     7 +-
 external/mpl/bind/dist/lib/dns/include/dns/dyndb.h                                 |    43 +-
 external/mpl/bind/dist/lib/dns/include/dns/ecdb.h                                  |     7 +-
 external/mpl/bind/dist/lib/dns/include/dns/ecs.h                                   |    10 +-
 external/mpl/bind/dist/lib/dns/include/dns/edns.h                                  |     6 +-
 external/mpl/bind/dist/lib/dns/include/dns/events.h                                |   125 +-
 external/mpl/bind/dist/lib/dns/include/dns/fixedname.h                             |    23 +-
 external/mpl/bind/dist/lib/dns/include/dns/forward.h                               |    14 +-
 external/mpl/bind/dist/lib/dns/include/dns/geoip.h                                 |    46 +-
 external/mpl/bind/dist/lib/dns/include/dns/ipkeylist.h                             |    21 +-
 external/mpl/bind/dist/lib/dns/include/dns/iptable.h                               |    16 +-
 external/mpl/bind/dist/lib/dns/include/dns/journal.h                               |    30 +-
 external/mpl/bind/dist/lib/dns/include/dns/kasp.h                                  |     2 +-
 external/mpl/bind/dist/lib/dns/include/dns/keydata.h                               |    20 +-
 external/mpl/bind/dist/lib/dns/include/dns/keyflags.h                              |     3 +-
 external/mpl/bind/dist/lib/dns/include/dns/keymgr.h                                |     2 +-
 external/mpl/bind/dist/lib/dns/include/dns/keytable.h                              |   189 +-
 external/mpl/bind/dist/lib/dns/include/dns/keyvalues.h                             |   117 +-
 external/mpl/bind/dist/lib/dns/include/dns/lib.h                                   |     5 +-
 external/mpl/bind/dist/lib/dns/include/dns/librpz.h                                |   491 +-
 external/mpl/bind/dist/lib/dns/include/dns/log.h                                   |    82 +-
 external/mpl/bind/dist/lib/dns/include/dns/lookup.h                                |    21 +-
 external/mpl/bind/dist/lib/dns/include/dns/master.h                                |   203 +-
 external/mpl/bind/dist/lib/dns/include/dns/masterdump.h                            |   113 +-
 external/mpl/bind/dist/lib/dns/include/dns/message.h                               |   312 +-
 external/mpl/bind/dist/lib/dns/include/dns/name.h                                  |   266 +-
 external/mpl/bind/dist/lib/dns/include/dns/ncache.h                                |    17 +-
 external/mpl/bind/dist/lib/dns/include/dns/nsec.h                                  |    18 +-
 external/mpl/bind/dist/lib/dns/include/dns/nsec3.h                                 |    71 +-
 external/mpl/bind/dist/lib/dns/include/dns/nta.h                                   |    39 +-
 external/mpl/bind/dist/lib/dns/include/dns/opcode.h                                |     6 +-
 external/mpl/bind/dist/lib/dns/include/dns/order.h                                 |     3 +-
 external/mpl/bind/dist/lib/dns/include/dns/peer.h                                  |    82 +-
 external/mpl/bind/dist/lib/dns/include/dns/private.h                               |    11 +-
 external/mpl/bind/dist/lib/dns/include/dns/rbt.h                                   |   164 +-
 external/mpl/bind/dist/lib/dns/include/dns/rcode.h                                 |    16 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdata.h                                 |   111 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdataclass.h                            |     6 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdatalist.h                             |    26 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdataset.h                              |   202 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdatasetiter.h                          |    42 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdataslab.h                             |    25 +-
 external/mpl/bind/dist/lib/dns/include/dns/rdatatype.h                             |     6 +-
 external/mpl/bind/dist/lib/dns/include/dns/request.h                               |    53 +-
 external/mpl/bind/dist/lib/dns/include/dns/resolver.h                              |   211 +-
 external/mpl/bind/dist/lib/dns/include/dns/result.h                                |   287 +-
 external/mpl/bind/dist/lib/dns/include/dns/rootns.h                                |     3 +-
 external/mpl/bind/dist/lib/dns/include/dns/rpz.h                                   |   343 +-
 external/mpl/bind/dist/lib/dns/include/dns/rriterator.h                            |    49 +-
 external/mpl/bind/dist/lib/dns/include/dns/rrl.h                                   |   199 +-
 external/mpl/bind/dist/lib/dns/include/dns/sdb.h                                   |    68 +-
 external/mpl/bind/dist/lib/dns/include/dns/sdlz.h                                  |   115 +-
 external/mpl/bind/dist/lib/dns/include/dns/secalg.h                                |     3 +-
 external/mpl/bind/dist/lib/dns/include/dns/secproto.h                              |     3 +-
 external/mpl/bind/dist/lib/dns/include/dns/soa.h                                   |    18 +-
 external/mpl/bind/dist/lib/dns/include/dns/ssu.h                                   |    42 +-
 external/mpl/bind/dist/lib/dns/include/dns/stats.h                                 |   622 +-
 external/mpl/bind/dist/lib/dns/include/dns/tcpmsg.h                                |    31 +-
 external/mpl/bind/dist/lib/dns/include/dns/time.h                                  |     4 +-
 external/mpl/bind/dist/lib/dns/include/dns/timer.h                                 |     3 +-
 external/mpl/bind/dist/lib/dns/include/dns/tkey.h                                  |    27 +-
 external/mpl/bind/dist/lib/dns/include/dns/tsec.h                                  |     7 +-
 external/mpl/bind/dist/lib/dns/include/dns/tsig.h                                  |    56 +-
 external/mpl/bind/dist/lib/dns/include/dns/ttl.h                                   |     6 +-
 external/mpl/bind/dist/lib/dns/include/dns/types.h                                 |   447 +-
 external/mpl/bind/dist/lib/dns/include/dns/update.h                                |     5 +-
 external/mpl/bind/dist/lib/dns/include/dns/validator.h                             |   122 +-
 external/mpl/bind/dist/lib/dns/include/dns/view.h                                  |   340 +-
 external/mpl/bind/dist/lib/dns/include/dns/xfrin.h                                 |    11 +-
 external/mpl/bind/dist/lib/dns/include/dns/zone.h                                  |   211 +-
 external/mpl/bind/dist/lib/dns/include/dns/zonekey.h                               |     3 +-
 external/mpl/bind/dist/lib/dns/include/dns/zoneverify.h                            |    10 +-
 external/mpl/bind/dist/lib/dns/include/dns/zt.h                                    |    14 +-
 external/mpl/bind/dist/lib/dns/include/dst/dst.h                                   |   394 +-
 external/mpl/bind/dist/lib/dns/include/dst/gssapi.h                                |    32 +-
 external/mpl/bind/dist/lib/dns/include/dst/result.h                                |    48 +-
 external/mpl/bind/dist/lib/dns/ipkeylist.c                                         |   103 +-
 external/mpl/bind/dist/lib/dns/iptable.c                                           |    47 +-
 external/mpl/bind/dist/lib/dns/journal.c                                           |   842 +-
 external/mpl/bind/dist/lib/dns/kasp.c                                              |     2 +-
 external/mpl/bind/dist/lib/dns/key.c                                               |    37 +-
 external/mpl/bind/dist/lib/dns/keydata.c                                           |    32 +-
 external/mpl/bind/dist/lib/dns/keymgr.c                                            |     6 +-
 external/mpl/bind/dist/lib/dns/keytable.c                                          |   771 +-
 external/mpl/bind/dist/lib/dns/lib.c                                               |    70 +-
 external/mpl/bind/dist/lib/dns/log.c                                               |    87 +-
 external/mpl/bind/dist/lib/dns/lookup.c                                            |   206 +-
 external/mpl/bind/dist/lib/dns/master.c                                            |  1494 +-
 external/mpl/bind/dist/lib/dns/masterdump.c                                        |  1042 +-
 external/mpl/bind/dist/lib/dns/message.c                                           |  1651 +-
 external/mpl/bind/dist/lib/dns/name.c                                              |   882 +-
 external/mpl/bind/dist/lib/dns/ncache.c                                            |   181 +-
 external/mpl/bind/dist/lib/dns/nsec.c                                              |   156 +-
 external/mpl/bind/dist/lib/dns/nsec3.c                                             |   906 +-
 external/mpl/bind/dist/lib/dns/nta.c                                               |   266 +-
 external/mpl/bind/dist/lib/dns/openssl_link.c                                      |   117 +-
 external/mpl/bind/dist/lib/dns/openssldh_link.c                                    |   284 +-
 external/mpl/bind/dist/lib/dns/opensslecdsa_link.c                                 |   678 +-
 external/mpl/bind/dist/lib/dns/openssleddsa_link.c                                 |   736 +-
 external/mpl/bind/dist/lib/dns/opensslrsa_link.c                                   |   408 +-
 external/mpl/bind/dist/lib/dns/order.c                                             |    59 +-
 external/mpl/bind/dist/lib/dns/peer.c                                              |   235 +-
 external/mpl/bind/dist/lib/dns/pkcs11.c                                            |    23 +-
 external/mpl/bind/dist/lib/dns/pkcs11ecdsa_link.c                                  |   689 +-
 external/mpl/bind/dist/lib/dns/pkcs11eddsa_link.c                                  |   758 +-
 external/mpl/bind/dist/lib/dns/pkcs11rsa_link.c                                    |  1058 +-
 external/mpl/bind/dist/lib/dns/portlist.c                                          |    87 +-
 external/mpl/bind/dist/lib/dns/private.c                                           |   222 +-
 external/mpl/bind/dist/lib/dns/rbt.c                                               |  1130 +-
 external/mpl/bind/dist/lib/dns/rbtdb.c                                             |  4293 ++--
 external/mpl/bind/dist/lib/dns/rbtdb.h                                             |     8 +-
 external/mpl/bind/dist/lib/dns/rcode.c                                             |   332 +-
 external/mpl/bind/dist/lib/dns/rdata.c                                             |   849 +-
 external/mpl/bind/dist/lib/dns/rdata/any_255/tsig_250.c                            |   128 +-
 external/mpl/bind/dist/lib/dns/rdata/any_255/tsig_250.h                            |    25 +-
 external/mpl/bind/dist/lib/dns/rdata/ch_3/a_1.c                                    |    43 +-
 external/mpl/bind/dist/lib/dns/rdata/ch_3/a_1.h                                    |    13 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/afsdb_18.c                            |    38 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/afsdb_18.h                            |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/amtrelay_260.c                        |     2 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/amtrelay_260.h                        |     2 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/avc_258.c                             |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/avc_258.h                             |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/caa_257.c                             |   339 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/caa_257.h                             |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cdnskey_60.c                          |    23 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cds_59.c                              |    10 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cert_37.c                             |    37 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cert_37.h                             |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cname_5.c                             |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/cname_5.h                             |     9 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/csync_62.c                            |    38 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/csync_62.h                            |    14 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dlv_32769.c                           |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dlv_32769.h                           |     3 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dname_39.c                            |    14 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dname_39.h                            |     9 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/dnskey_48.c                           |    24 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/doa_259.c                             |     4 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/doa_259.h                             |    20 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.c                               |    52 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ds_43.h                               |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/eui48_108.c                           |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/eui48_108.h                           |     6 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/eui64_109.c                           |    27 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/eui64_109.h                           |     6 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/gpos_27.c                             |    50 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/gpos_27.h                             |    19 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/hinfo_13.c                            |    31 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/hinfo_13.h                            |    15 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/hip_55.c                              |   104 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/hip_55.h                              |    23 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ipseckey_45.c                         |    92 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ipseckey_45.h                         |    23 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/isdn_20.c                             |    35 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/isdn_20.h                             |    15 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/key_25.c                              |    77 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/key_25.h                              |    18 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/keydata_65533.c                       |    70 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/keydata_65533.h                       |    23 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/l32_105.c                             |    20 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/l32_105.h                             |     8 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/l64_106.c                             |    25 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/l64_106.h                             |     8 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/loc_29.c                              |   384 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/loc_29.h                              |    19 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/lp_107.c                              |    25 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/lp_107.h                              |    10 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mb_7.c                                |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mb_7.h                                |     9 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/md_3.c                                |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/md_3.h                                |    10 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mf_4.c                                |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mf_4.h                                |     9 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mg_8.c                                |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mg_8.h                                |     9 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/minfo_14.c                            |    47 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/minfo_14.h                            |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mr_9.c                                |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mr_9.h                                |     9 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mx_15.c                               |    63 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/mx_15.h                               |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/naptr_35.c                            |   176 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/naptr_35.h                            |    25 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nid_104.c                             |    25 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nid_104.h                             |     8 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ninfo_56.c                            |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ns_2.c                                |    25 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ns_2.h                                |    10 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec3_50.c                            |    70 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec3_50.h                            |    26 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec3param_51.c                       |    51 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec3param_51.h                       |    18 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec_47.c                             |    44 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nsec_47.h                             |    13 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/null_10.c                             |    15 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/null_10.h                             |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nxt_30.c                              |    84 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/nxt_30.h                              |    13 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/openpgpkey_61.c                       |    37 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/openpgpkey_61.h                       |    10 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.c                              |    60 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.h                              |    19 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/proforma.c                            |   101 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/proforma.h                            |    14 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ptr_12.c                              |    48 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ptr_12.h                              |     9 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rkey_57.c                             |    24 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rp_17.c                               |    44 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rp_17.h                               |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rrsig_46.c                            |    95 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rrsig_46.h                            |    28 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rt_21.c                               |    47 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/rt_21.h                               |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sig_24.c                              |    60 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sig_24.h                              |    28 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sink_40.c                             |    59 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sink_40.h                             |    16 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/smimea_53.c                           |    10 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/soa_6.c                               |    78 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/soa_6.h                               |    22 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/spf_99.c                              |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/spf_99.h                              |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sshfp_44.c                            |    40 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/sshfp_44.h                            |    15 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/ta_32768.c                            |    16 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/talink_58.c                           |    35 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/talink_58.h                           |    14 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/tkey_249.c                            |   115 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/tkey_249.h                            |    26 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/tlsa_52.c                             |    46 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/tlsa_52.h                             |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/txt_16.c                              |    45 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/txt_16.h                              |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/uri_256.c                             |    44 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/uri_256.h                             |    15 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/x25_19.c                              |    36 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/x25_19.h                              |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/zonemd_63.c                           |     2 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/zonemd_63.h                           |     2 +-
 external/mpl/bind/dist/lib/dns/rdata/hs_4/a_1.c                                    |    24 +-
 external/mpl/bind/dist/lib/dns/rdata/hs_4/a_1.h                                    |     7 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a6_38.c                                  |    94 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a6_38.h                                  |    13 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a_1.c                                    |    30 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/a_1.h                                    |     7 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/aaaa_28.c                                |    49 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/aaaa_28.h                                |     7 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/apl_42.c                                 |    94 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/apl_42.h                                 |    23 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/atma_34.c                                |     8 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/atma_34.h                                |    13 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/dhcid_49.c                               |    38 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/dhcid_49.h                               |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/eid_31.c                                 |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/eid_31.h                                 |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/kx_36.c                                  |    21 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/kx_36.h                                  |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nimloc_32.c                              |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nimloc_32.h                              |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nsap-ptr_23.c                            |    12 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nsap-ptr_23.h                            |     9 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nsap_22.c                                |    30 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/nsap_22.h                                |    11 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/px_26.c                                  |    37 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/px_26.h                                  |    13 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/srv_33.c                                 |    54 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/srv_33.h                                 |    14 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c                                 |   134 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.h                                 |    17 +-
 external/mpl/bind/dist/lib/dns/rdata/rdatastructpre.h                              |    15 +-
 external/mpl/bind/dist/lib/dns/rdata/rdatastructsuf.h                              |     3 +-
 external/mpl/bind/dist/lib/dns/rdatalist.c                                         |   159 +-
 external/mpl/bind/dist/lib/dns/rdatalist_p.h                                       |     4 +-
 external/mpl/bind/dist/lib/dns/rdataset.c                                          |   229 +-
 external/mpl/bind/dist/lib/dns/rdatasetiter.c                                      |    10 +-
 external/mpl/bind/dist/lib/dns/rdataslab.c                                         |   360 +-
 external/mpl/bind/dist/lib/dns/request.c                                           |   730 +-
 external/mpl/bind/dist/lib/dns/resolver.c                                          |  4393 ++--
 external/mpl/bind/dist/lib/dns/result.c                                            |   308 +-
 external/mpl/bind/dist/lib/dns/rootns.c                                            |   291 +-
 external/mpl/bind/dist/lib/dns/rpz.c                                               |  1026 +-
 external/mpl/bind/dist/lib/dns/rriterator.c                                        |    80 +-
 external/mpl/bind/dist/lib/dns/rrl.c                                               |   474 +-
 external/mpl/bind/dist/lib/dns/sdb.c                                               |   722 +-
 external/mpl/bind/dist/lib/dns/sdlz.c                                              |   871 +-
 external/mpl/bind/dist/lib/dns/soa.c                                               |    36 +-
 external/mpl/bind/dist/lib/dns/spnego.c                                            |   957 +-
 external/mpl/bind/dist/lib/dns/spnego.h                                            |    40 +-
 external/mpl/bind/dist/lib/dns/spnego_asn1.c                                       |   591 +-
 external/mpl/bind/dist/lib/dns/ssu.c                                               |   329 +-
 external/mpl/bind/dist/lib/dns/ssu_external.c                                      |    84 +-
 external/mpl/bind/dist/lib/dns/stats.c                                             |   481 +-
 external/mpl/bind/dist/lib/dns/tcpmsg.c                                            |    69 +-
 external/mpl/bind/dist/lib/dns/tests/acl_test.c                                    |    65 +-
 external/mpl/bind/dist/lib/dns/tests/db_test.c                                     |   113 +-
 external/mpl/bind/dist/lib/dns/tests/dbdiff_test.c                                 |    40 +-
 external/mpl/bind/dist/lib/dns/tests/dbiterator_test.c                             |    58 +-
 external/mpl/bind/dist/lib/dns/tests/dbversion_test.c                              |   116 +-
 external/mpl/bind/dist/lib/dns/tests/dh_test.c                                     |    30 +-
 external/mpl/bind/dist/lib/dns/tests/dispatch_test.c                               |    85 +-
 external/mpl/bind/dist/lib/dns/tests/dnstap_test.c                                 |    60 +-
 external/mpl/bind/dist/lib/dns/tests/dnstest.c                                     |   191 +-
 external/mpl/bind/dist/lib/dns/tests/dnstest.h                                     |    21 +-
 external/mpl/bind/dist/lib/dns/tests/dst_test.c                                    |   101 +-
 external/mpl/bind/dist/lib/dns/tests/geoip_test.c                                  |   425 +-
 external/mpl/bind/dist/lib/dns/tests/keytable_test.c                               |   537 +-
 external/mpl/bind/dist/lib/dns/tests/master_test.c                                 |   162 +-
 external/mpl/bind/dist/lib/dns/tests/name_test.c                                   |   226 +-
 external/mpl/bind/dist/lib/dns/tests/nsec3_test.c                                  |    36 +-
 external/mpl/bind/dist/lib/dns/tests/peer_test.c                                   |    13 +-
 external/mpl/bind/dist/lib/dns/tests/private_test.c                                |    76 +-
 external/mpl/bind/dist/lib/dns/tests/rbt_serialize_test.c                          |   123 +-
 external/mpl/bind/dist/lib/dns/tests/rbt_test.c                                    |   311 +-
 external/mpl/bind/dist/lib/dns/tests/rdata_test.c                                  |  1279 +-
 external/mpl/bind/dist/lib/dns/tests/rdataset_test.c                               |    23 +-
 external/mpl/bind/dist/lib/dns/tests/rdatasetstats_test.c                          |    56 +-
 external/mpl/bind/dist/lib/dns/tests/resolver_test.c                               |    45 +-
 external/mpl/bind/dist/lib/dns/tests/result_test.c                                 |    40 +-
 external/mpl/bind/dist/lib/dns/tests/rsa_test.c                                    |   203 +-
 external/mpl/bind/dist/lib/dns/tests/sigs_test.c                                   |    62 +-
 external/mpl/bind/dist/lib/dns/tests/time_test.c                                   |    39 +-
 external/mpl/bind/dist/lib/dns/tests/tsig_test.c                                   |   127 +-
 external/mpl/bind/dist/lib/dns/tests/update_test.c                                 |    60 +-
 external/mpl/bind/dist/lib/dns/tests/zonemgr_test.c                                |    38 +-
 external/mpl/bind/dist/lib/dns/tests/zt_test.c                                     |    97 +-
 external/mpl/bind/dist/lib/dns/time.c                                              |    75 +-
 external/mpl/bind/dist/lib/dns/timer.c                                             |    25 +-
 external/mpl/bind/dist/lib/dns/tkey.c                                              |   536 +-
 external/mpl/bind/dist/lib/dns/tsec.c                                              |    35 +-
 external/mpl/bind/dist/lib/dns/tsig.c                                              |   657 +-
 external/mpl/bind/dist/lib/dns/tsig_p.h                                            |     3 +-
 external/mpl/bind/dist/lib/dns/ttl.c                                               |    91 +-
 external/mpl/bind/dist/lib/dns/update.c                                            |   979 +-
 external/mpl/bind/dist/lib/dns/validator.c                                         |  3429 +--
 external/mpl/bind/dist/lib/dns/version.c                                           |     4 +-
 external/mpl/bind/dist/lib/dns/view.c                                              |   932 +-
 external/mpl/bind/dist/lib/dns/win32/DLLMain.c                                     |    12 +-
 external/mpl/bind/dist/lib/dns/win32/version.c                                     |     4 +-
 external/mpl/bind/dist/lib/dns/xfrin.c                                             |   698 +-
 external/mpl/bind/dist/lib/dns/zone.c                                              |  8521 +++++----
 external/mpl/bind/dist/lib/dns/zone_p.h                                            |    10 +-
 external/mpl/bind/dist/lib/dns/zonekey.c                                           |    17 +-
 external/mpl/bind/dist/lib/dns/zoneverify.c                                        |   652 +-
 external/mpl/bind/dist/lib/dns/zt.c                                                |   293 +-
 external/mpl/bind/dist/lib/irs/context.c                                           |   207 +-
 external/mpl/bind/dist/lib/irs/dnsconf.c                                           |   292 +-
 external/mpl/bind/dist/lib/irs/gai_strerror.c                                      |    51 +-
 external/mpl/bind/dist/lib/irs/getaddrinfo.c                                       |   414 +-
 external/mpl/bind/dist/lib/irs/getnameinfo.c                                       |   153 +-
 external/mpl/bind/dist/lib/irs/include/irs/context.h                               |     4 +-
 external/mpl/bind/dist/lib/irs/include/irs/dnsconf.h                               |    20 +-
 external/mpl/bind/dist/lib/irs/include/irs/resconf.h                               |     7 +-
 external/mpl/bind/dist/lib/irs/include/irs/types.h                                 |     9 +-
 external/mpl/bind/dist/lib/irs/include/irs/version.h                               |     3 +-
 external/mpl/bind/dist/lib/irs/resconf.c                                           |   265 +-
 external/mpl/bind/dist/lib/irs/tests/resconf_test.c                                |   103 +-
 external/mpl/bind/dist/lib/irs/version.c                                           |     4 +-
 external/mpl/bind/dist/lib/irs/win32/DLLMain.c                                     |    12 +-
 external/mpl/bind/dist/lib/irs/win32/include/irs/netdb.h                           |   190 +-
 external/mpl/bind/dist/lib/irs/win32/include/irs/platform.h                        |    10 +-
 external/mpl/bind/dist/lib/irs/win32/resconf.c                                     |    13 +-
 external/mpl/bind/dist/lib/irs/win32/version.c                                     |     4 +-
 external/mpl/bind/dist/lib/isc/aes.c                                               |    46 +-
 external/mpl/bind/dist/lib/isc/app.c                                               |     2 +-
 external/mpl/bind/dist/lib/isc/assertions.c                                        |    22 +-
 external/mpl/bind/dist/lib/isc/astack.c                                            |     2 +-
 external/mpl/bind/dist/lib/isc/backtrace-emptytbl.c                                |    10 +-
 external/mpl/bind/dist/lib/isc/backtrace.c                                         |    94 +-
 external/mpl/bind/dist/lib/isc/base32.c                                            |   182 +-
 external/mpl/bind/dist/lib/isc/base64.c                                            |   121 +-
 external/mpl/bind/dist/lib/isc/bind9.c                                             |     4 +-
 external/mpl/bind/dist/lib/isc/buffer.c                                            |    52 +-
 external/mpl/bind/dist/lib/isc/bufferlist.c                                        |     5 +-
 external/mpl/bind/dist/lib/isc/commandline.c                                       |    71 +-
 external/mpl/bind/dist/lib/isc/counter.c                                           |    52 +-
 external/mpl/bind/dist/lib/isc/crc64.c                                             |    11 +-
 external/mpl/bind/dist/lib/isc/entropy.c                                           |    14 +-
 external/mpl/bind/dist/lib/isc/error.c                                             |    25 +-
 external/mpl/bind/dist/lib/isc/event.c                                             |    29 +-
 external/mpl/bind/dist/lib/isc/fsaccess.c                                          |    48 +-
 external/mpl/bind/dist/lib/isc/hash.c                                              |    97 +-
 external/mpl/bind/dist/lib/isc/heap.c                                              |   107 +-
 external/mpl/bind/dist/lib/isc/hex.c                                               |    61 +-
 external/mpl/bind/dist/lib/isc/hmac.c                                              |    37 +-
 external/mpl/bind/dist/lib/isc/hp.c                                                |     4 +-
 external/mpl/bind/dist/lib/isc/ht.c                                                |    86 +-
 external/mpl/bind/dist/lib/isc/httpd.c                                             |   808 +-
 external/mpl/bind/dist/lib/isc/include/isc/aes.h                                   |     3 +-
 external/mpl/bind/dist/lib/isc/include/isc/app.h                                   |    68 +-
 external/mpl/bind/dist/lib/isc/include/isc/assertions.h                            |    50 +-
 external/mpl/bind/dist/lib/isc/include/isc/astack.h                                |     2 +-
 external/mpl/bind/dist/lib/isc/include/isc/atomic.h                                |    58 +-
 external/mpl/bind/dist/lib/isc/include/isc/backtrace.h                             |    13 +-
 external/mpl/bind/dist/lib/isc/include/isc/base32.h                                |     6 +-
 external/mpl/bind/dist/lib/isc/include/isc/base64.h                                |     7 +-
 external/mpl/bind/dist/lib/isc/include/isc/bind9.h                                 |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/buffer.h                                |   532 +-
 external/mpl/bind/dist/lib/isc/include/isc/bufferlist.h                            |    17 +-
 external/mpl/bind/dist/lib/isc/include/isc/commandline.h                           |     5 +-
 external/mpl/bind/dist/lib/isc/include/isc/counter.h                               |    10 +-
 external/mpl/bind/dist/lib/isc/include/isc/deprecated.h                            |    13 +-
 external/mpl/bind/dist/lib/isc/include/isc/endian.h                                |   193 +-
 external/mpl/bind/dist/lib/isc/include/isc/error.h                                 |    20 +-
 external/mpl/bind/dist/lib/isc/include/isc/event.h                                 |    65 +-
 external/mpl/bind/dist/lib/isc/include/isc/eventclass.h                            |    25 +-
 external/mpl/bind/dist/lib/isc/include/isc/file.h                                  |    20 +-
 external/mpl/bind/dist/lib/isc/include/isc/formatcheck.h                           |    13 +-
 external/mpl/bind/dist/lib/isc/include/isc/fsaccess.h                              |    27 +-
 external/mpl/bind/dist/lib/isc/include/isc/heap.h                                  |     3 +-
 external/mpl/bind/dist/lib/isc/include/isc/hex.h                                   |     7 +-
 external/mpl/bind/dist/lib/isc/include/isc/hmac.h                                  |    22 +-
 external/mpl/bind/dist/lib/isc/include/isc/hp.h                                    |     2 +-
 external/mpl/bind/dist/lib/isc/include/isc/ht.h                                    |    15 +-
 external/mpl/bind/dist/lib/isc/include/isc/httpd.h                                 |    34 +-
 external/mpl/bind/dist/lib/isc/include/isc/interfaceiter.h                         |    30 +-
 external/mpl/bind/dist/lib/isc/include/isc/iterated_hash.h                         |    10 +-
 external/mpl/bind/dist/lib/isc/include/isc/json.h                                  |    46 -
 external/mpl/bind/dist/lib/isc/include/isc/lang.h                                  |    11 +-
 external/mpl/bind/dist/lib/isc/include/isc/lex.h                                   |    57 +-
 external/mpl/bind/dist/lib/isc/include/isc/lfsr.h                                  |    21 +-
 external/mpl/bind/dist/lib/isc/include/isc/lib.h                                   |     5 +-
 external/mpl/bind/dist/lib/isc/include/isc/likely.h                                |    19 +-
 external/mpl/bind/dist/lib/isc/include/isc/list.h                                  |   215 +-
 external/mpl/bind/dist/lib/isc/include/isc/log.h                                   |   165 +-
 external/mpl/bind/dist/lib/isc/include/isc/magic.h                                 |    11 +-
 external/mpl/bind/dist/lib/isc/include/isc/md.h                                    |    55 +-
 external/mpl/bind/dist/lib/isc/include/isc/mem.h                                   |   198 +-
 external/mpl/bind/dist/lib/isc/include/isc/meminfo.h                               |     7 +-
 external/mpl/bind/dist/lib/isc/include/isc/mutexatomic.h                           |     2 +-
 external/mpl/bind/dist/lib/isc/include/isc/mutexblock.h                            |     3 +-
 external/mpl/bind/dist/lib/isc/include/isc/netaddr.h                               |    13 +-
 external/mpl/bind/dist/lib/isc/include/isc/netmgr.h                                |     5 +-
 external/mpl/bind/dist/lib/isc/include/isc/netscope.h                              |     3 +-
 external/mpl/bind/dist/lib/isc/include/isc/os.h                                    |     3 +-
 external/mpl/bind/dist/lib/isc/include/isc/parseint.h                              |     3 +-
 external/mpl/bind/dist/lib/isc/include/isc/pool.h                                  |    27 +-
 external/mpl/bind/dist/lib/isc/include/isc/portset.h                               |     5 +-
 external/mpl/bind/dist/lib/isc/include/isc/print.h                                 |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/queue.h                                 |   179 +-
 external/mpl/bind/dist/lib/isc/include/isc/quota.h                                 |    77 +-
 external/mpl/bind/dist/lib/isc/include/isc/radix.h                                 |   141 +-
 external/mpl/bind/dist/lib/isc/include/isc/ratelimiter.h                           |    11 +-
 external/mpl/bind/dist/lib/isc/include/isc/refcount.h                              |    72 +-
 external/mpl/bind/dist/lib/isc/include/isc/regex.h                                 |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/region.h                                |    57 +-
 external/mpl/bind/dist/lib/isc/include/isc/resource.h                              |     4 +-
 external/mpl/bind/dist/lib/isc/include/isc/result.h                                |   157 +-
 external/mpl/bind/dist/lib/isc/include/isc/resultclass.h                           |    29 +-
 external/mpl/bind/dist/lib/isc/include/isc/rwlock.h                                |    38 +-
 external/mpl/bind/dist/lib/isc/include/isc/safe.h                                  |    12 +-
 external/mpl/bind/dist/lib/isc/include/isc/serial.h                                |     5 +-
 external/mpl/bind/dist/lib/isc/include/isc/siphash.h                               |     6 +-
 external/mpl/bind/dist/lib/isc/include/isc/sockaddr.h                              |    43 +-
 external/mpl/bind/dist/lib/isc/include/isc/socket.h                                |   304 +-
 external/mpl/bind/dist/lib/isc/include/isc/stats.h                                 |   121 +-
 external/mpl/bind/dist/lib/isc/include/isc/stdio.h                                 |     6 +-
 external/mpl/bind/dist/lib/isc/include/isc/strerr.h                                |     6 +-
 external/mpl/bind/dist/lib/isc/include/isc/string.h                                |     6 +-
 external/mpl/bind/dist/lib/isc/include/isc/symtab.h                                |    21 +-
 external/mpl/bind/dist/lib/isc/include/isc/task.h                                  |   107 +-
 external/mpl/bind/dist/lib/isc/include/isc/taskpool.h                              |    23 +-
 external/mpl/bind/dist/lib/isc/include/isc/timer.h                                 |    75 +-
 external/mpl/bind/dist/lib/isc/include/isc/tm.h                                    |     3 +-
 external/mpl/bind/dist/lib/isc/include/isc/types.h                                 |   144 +-
 external/mpl/bind/dist/lib/isc/include/isc/util.h                                  |   264 +-
 external/mpl/bind/dist/lib/isc/include/isc/version.h                               |     3 +-
 external/mpl/bind/dist/lib/isc/include/isc/xml.h                                   |    37 -
 external/mpl/bind/dist/lib/isc/include/pk11/constants.h                            |   103 +-
 external/mpl/bind/dist/lib/isc/include/pk11/internal.h                             |    31 +-
 external/mpl/bind/dist/lib/isc/include/pk11/pk11.h                                 |   107 +-
 external/mpl/bind/dist/lib/isc/include/pk11/result.h                               |    20 +-
 external/mpl/bind/dist/lib/isc/include/pkcs11/eddsa.h                              |    35 -
 external/mpl/bind/dist/lib/isc/include/pkcs11/pkcs11.h                             |  1853 +-
 external/mpl/bind/dist/lib/isc/include/pkcs11/pkcs11f.h                            |   940 -
 external/mpl/bind/dist/lib/isc/include/pkcs11/pkcs11t.h                            |  2008 --
 external/mpl/bind/dist/lib/isc/iterated_hash.c                                     |    16 +-
 external/mpl/bind/dist/lib/isc/lex.c                                               |   374 +-
 external/mpl/bind/dist/lib/isc/lfsr.c                                              |    54 +-
 external/mpl/bind/dist/lib/isc/lib.c                                               |     5 +-
 external/mpl/bind/dist/lib/isc/log.c                                               |  1193 +-
 external/mpl/bind/dist/lib/isc/md.c                                                |    43 +-
 external/mpl/bind/dist/lib/isc/mem.c                                               |  1195 +-
 external/mpl/bind/dist/lib/isc/mutexblock.c                                        |     5 +-
 external/mpl/bind/dist/lib/isc/netaddr.c                                           |   139 +-
 external/mpl/bind/dist/lib/isc/netmgr/netmgr-int.h                                 |     2 +-
 external/mpl/bind/dist/lib/isc/netmgr/netmgr.c                                     |     9 +-
 external/mpl/bind/dist/lib/isc/netmgr/tcp.c                                        |     4 +-
 external/mpl/bind/dist/lib/isc/netmgr/tcpdns.c                                     |     2 +-
 external/mpl/bind/dist/lib/isc/netmgr/udp.c                                        |     2 +-
 external/mpl/bind/dist/lib/isc/netmgr/uv-compat.c                                  |     2 +-
 external/mpl/bind/dist/lib/isc/netmgr/uv-compat.h                                  |     2 +-
 external/mpl/bind/dist/lib/isc/netmgr/uverr2result.c                               |     2 +-
 external/mpl/bind/dist/lib/isc/netscope.c                                          |    36 +-
 external/mpl/bind/dist/lib/isc/nonce.c                                             |     4 +-
 external/mpl/bind/dist/lib/isc/openssl_shim.c                                      |    61 +-
 external/mpl/bind/dist/lib/isc/openssl_shim.h                                      |    56 +-
 external/mpl/bind/dist/lib/isc/parseint.c                                          |    32 +-
 external/mpl/bind/dist/lib/isc/pk11.c                                              |   482 +-
 external/mpl/bind/dist/lib/isc/pk11_result.c                                       |    23 +-
 external/mpl/bind/dist/lib/isc/pool.c                                              |    47 +-
 external/mpl/bind/dist/lib/isc/portset.c                                           |    17 +-
 external/mpl/bind/dist/lib/isc/pthreads/condition.c                                |    23 +-
 external/mpl/bind/dist/lib/isc/pthreads/include/isc/condition.h                    |    43 +-
 external/mpl/bind/dist/lib/isc/pthreads/include/isc/mutex.h                        |    96 +-
 external/mpl/bind/dist/lib/isc/pthreads/include/isc/once.h                         |     6 +-
 external/mpl/bind/dist/lib/isc/pthreads/include/isc/thread.h                       |    42 +-
 external/mpl/bind/dist/lib/isc/pthreads/mutex.c                                    |   136 +-
 external/mpl/bind/dist/lib/isc/pthreads/thread.c                                   |   106 +-
 external/mpl/bind/dist/lib/isc/queue.c                                             |     2 +-
 external/mpl/bind/dist/lib/isc/quota.c                                             |   129 +-
 external/mpl/bind/dist/lib/isc/radix.c                                             |   128 +-
 external/mpl/bind/dist/lib/isc/random.c                                            |    53 +-
 external/mpl/bind/dist/lib/isc/ratelimiter.c                                       |   131 +-
 external/mpl/bind/dist/lib/isc/regex.c                                             |   216 +-
 external/mpl/bind/dist/lib/isc/region.c                                            |    15 +-
 external/mpl/bind/dist/lib/isc/result.c                                            |   223 +-
 external/mpl/bind/dist/lib/isc/rwlock.c                                            |   391 +-
 external/mpl/bind/dist/lib/isc/safe.c                                              |    26 +
 external/mpl/bind/dist/lib/isc/serial.c                                            |    10 +-
 external/mpl/bind/dist/lib/isc/siphash.c                                           |   132 +-
 external/mpl/bind/dist/lib/isc/sockaddr.c                                          |   164 +-
 external/mpl/bind/dist/lib/isc/stats.c                                             |    78 +-
 external/mpl/bind/dist/lib/isc/string.c                                            |    30 +-
 external/mpl/bind/dist/lib/isc/symtab.c                                            |   137 +-
 external/mpl/bind/dist/lib/isc/task.c                                              |   690 +-
 external/mpl/bind/dist/lib/isc/task_p.h                                            |     3 +-
 external/mpl/bind/dist/lib/isc/taskpool.c                                          |    60 +-
 external/mpl/bind/dist/lib/isc/tests/aes_test.c                                    |   197 +-
 external/mpl/bind/dist/lib/isc/tests/buffer_test.c                                 |    57 +-
 external/mpl/bind/dist/lib/isc/tests/counter_test.c                                |    17 +-
 external/mpl/bind/dist/lib/isc/tests/crc64_test.c                                  |    22 +-
 external/mpl/bind/dist/lib/isc/tests/errno_test.c                                  |    97 +-
 external/mpl/bind/dist/lib/isc/tests/file_test.c                                   |    35 +-
 external/mpl/bind/dist/lib/isc/tests/hash_test.c                                   |    15 +-
 external/mpl/bind/dist/lib/isc/tests/heap_test.c                                   |    45 +-
 external/mpl/bind/dist/lib/isc/tests/hmac_test.c                                   |   156 +-
 external/mpl/bind/dist/lib/isc/tests/ht_test.c                                     |   100 +-
 external/mpl/bind/dist/lib/isc/tests/isctest.c                                     |    81 +-
 external/mpl/bind/dist/lib/isc/tests/isctest.h                                     |    21 +-
 external/mpl/bind/dist/lib/isc/tests/lex_test.c                                    |    52 +-
 external/mpl/bind/dist/lib/isc/tests/md_test.c                                     |    66 +-
 external/mpl/bind/dist/lib/isc/tests/mem_test.c                                    |   282 +-
 external/mpl/bind/dist/lib/isc/tests/netaddr_test.c                                |    41 +-
 external/mpl/bind/dist/lib/isc/tests/parse_test.c                                  |    17 +-
 external/mpl/bind/dist/lib/isc/tests/pool_test.c                                   |    44 +-
 external/mpl/bind/dist/lib/isc/tests/queue_test.c                                  |   171 -
 external/mpl/bind/dist/lib/isc/tests/quota_test.c                                  |     2 +-
 external/mpl/bind/dist/lib/isc/tests/radix_test.c                                  |    17 +-
 external/mpl/bind/dist/lib/isc/tests/random_test.c                                 |   136 +-
 external/mpl/bind/dist/lib/isc/tests/regex_test.c                                  |  2213 ++-
 external/mpl/bind/dist/lib/isc/tests/result_test.c                                 |    28 +-
 external/mpl/bind/dist/lib/isc/tests/safe_test.c                                   |    25 +-
 external/mpl/bind/dist/lib/isc/tests/siphash_test.c                                |   737 +-
 external/mpl/bind/dist/lib/isc/tests/sockaddr_test.c                               |    35 +-
 external/mpl/bind/dist/lib/isc/tests/socket_test.c                                 |   211 +-
 external/mpl/bind/dist/lib/isc/tests/symtab_test.c                                 |    33 +-
 external/mpl/bind/dist/lib/isc/tests/task_test.c                                   |   455 +-
 external/mpl/bind/dist/lib/isc/tests/taskpool_test.c                               |    32 +-
 external/mpl/bind/dist/lib/isc/tests/time_test.c                                   |    13 +-
 external/mpl/bind/dist/lib/isc/tests/timer_test.c                                  |   218 +-
 external/mpl/bind/dist/lib/isc/timer.c                                             |   289 +-
 external/mpl/bind/dist/lib/isc/tm.c                                                |   254 +-
 external/mpl/bind/dist/lib/isc/unix/app.c                                          |   675 -
 external/mpl/bind/dist/lib/isc/unix/dir.c                                          |    66 +-
 external/mpl/bind/dist/lib/isc/unix/errno.c                                        |     4 +-
 external/mpl/bind/dist/lib/isc/unix/errno2result.c                                 |    44 +-
 external/mpl/bind/dist/lib/isc/unix/errno2result.h                                 |     8 +-
 external/mpl/bind/dist/lib/isc/unix/file.c                                         |   278 +-
 external/mpl/bind/dist/lib/isc/unix/fsaccess.c                                     |    44 +-
 external/mpl/bind/dist/lib/isc/unix/ifiter_getifaddrs.c                            |   116 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/align.h                            |     7 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/dir.h                              |    24 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/net.h                              |   133 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/netdb.h                            |    11 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/offset.h                           |     8 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/stat.h                             |     9 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/stdatomic.h                        |     4 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/stdtime.h                          |     6 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/syslog.h                           |     3 +-
 external/mpl/bind/dist/lib/isc/unix/include/isc/time.h                             |    17 +-
 external/mpl/bind/dist/lib/isc/unix/include/pkcs11/Makefile.in                     |    31 -
 external/mpl/bind/dist/lib/isc/unix/include/pkcs11/cryptoki.h                      |    68 -
 external/mpl/bind/dist/lib/isc/unix/interfaceiter.c                                |    96 +-
 external/mpl/bind/dist/lib/isc/unix/meminfo.c                                      |    21 +-
 external/mpl/bind/dist/lib/isc/unix/net.c                                          |   243 +-
 external/mpl/bind/dist/lib/isc/unix/os.c                                           |    35 +-
 external/mpl/bind/dist/lib/isc/unix/pk11_api.c                                     |   565 +-
 external/mpl/bind/dist/lib/isc/unix/resource.c                                     |    70 +-
 external/mpl/bind/dist/lib/isc/unix/socket.c                                       |  2101 +-
 external/mpl/bind/dist/lib/isc/unix/socket_p.h                                     |    11 +-
 external/mpl/bind/dist/lib/isc/unix/stdio.c                                        |    59 +-
 external/mpl/bind/dist/lib/isc/unix/stdtime.c                                      |    77 +-
 external/mpl/bind/dist/lib/isc/unix/syslog.c                                       |    60 +-
 external/mpl/bind/dist/lib/isc/unix/time.c                                         |   205 +-
 external/mpl/bind/dist/lib/isc/version.c                                           |     4 +-
 external/mpl/bind/dist/lib/isc/win32/DLLMain.c                                     |    15 +-
 external/mpl/bind/dist/lib/isc/win32/app.c                                         |   421 -
 external/mpl/bind/dist/lib/isc/win32/condition.c                                   |    61 +-
 external/mpl/bind/dist/lib/isc/win32/dir.c                                         |    70 +-
 external/mpl/bind/dist/lib/isc/win32/errno.c                                       |     4 +-
 external/mpl/bind/dist/lib/isc/win32/errno2result.c                                |    15 +-
 external/mpl/bind/dist/lib/isc/win32/errno2result.h                                |     8 +-
 external/mpl/bind/dist/lib/isc/win32/file.c                                        |   327 +-
 external/mpl/bind/dist/lib/isc/win32/fsaccess.c                                    |   163 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/align.h                           |     2 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/bind_registry.h                   |    31 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/bindevt.h                         |    13 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/condition.h                       |    14 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/dir.h                             |    27 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/ipv6.h                            |   100 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/mutex.h                           |    21 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/net.h                             |   257 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/netdb.h                           |     7 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/ntgroups.h                        |     8 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/ntpaths.h                         |    15 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/offset.h                          |     6 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/once.h                            |    12 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/stat.h                            |    43 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/stdatomic.h                       |   517 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/stdtime.h                         |     6 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/syslog.h                          |     3 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/thread.h                          |    73 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/time.h                            |    39 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/win32os.h                         |     5 +-
 external/mpl/bind/dist/lib/isc/win32/include/pkcs11/Makefile.in                    |    26 -
 external/mpl/bind/dist/lib/isc/win32/include/pkcs11/cryptoki.h                     |    68 -
 external/mpl/bind/dist/lib/isc/win32/interfaceiter.c                               |   220 +-
 external/mpl/bind/dist/lib/isc/win32/ipv6.c                                        |     4 +-
 external/mpl/bind/dist/lib/isc/win32/libgen.h                                      |    11 +-
 external/mpl/bind/dist/lib/isc/win32/meminfo.c                                     |     4 +-
 external/mpl/bind/dist/lib/isc/win32/net.c                                         |    72 +-
 external/mpl/bind/dist/lib/isc/win32/netdb.h                                       |   194 +-
 external/mpl/bind/dist/lib/isc/win32/ntgroups.c                                    |    54 +-
 external/mpl/bind/dist/lib/isc/win32/ntpaths.c                                     |    22 +-
 external/mpl/bind/dist/lib/isc/win32/once.c                                        |     9 +-
 external/mpl/bind/dist/lib/isc/win32/os.c                                          |    10 +-
 external/mpl/bind/dist/lib/isc/win32/pk11_api.c                                    |   727 +-
 external/mpl/bind/dist/lib/isc/win32/resource.c                                    |    27 +-
 external/mpl/bind/dist/lib/isc/win32/socket.c                                      |  1487 +-
 external/mpl/bind/dist/lib/isc/win32/stdio.c                                       |    74 +-
 external/mpl/bind/dist/lib/isc/win32/stdtime.c                                     |     5 +-
 external/mpl/bind/dist/lib/isc/win32/syslog.c                                      |    67 +-
 external/mpl/bind/dist/lib/isc/win32/syslog.h                                      |    55 +-
 external/mpl/bind/dist/lib/isc/win32/thread.c                                      |    53 +-
 external/mpl/bind/dist/lib/isc/win32/time.c                                        |   126 +-
 external/mpl/bind/dist/lib/isc/win32/unistd.h                                      |    20 +-
 external/mpl/bind/dist/lib/isc/win32/version.c                                     |     4 +-
 external/mpl/bind/dist/lib/isc/win32/win32os.c                                     |    60 +-
 external/mpl/bind/dist/lib/isc/xoshiro128starstar.c                                |    68 +-
 external/mpl/bind/dist/lib/isccc/alist.c                                           |   130 +-
 external/mpl/bind/dist/lib/isccc/base64.c                                          |    14 +-
 external/mpl/bind/dist/lib/isccc/cc.c                                              |   404 +-
 external/mpl/bind/dist/lib/isccc/ccmsg.c                                           |    71 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/alist.h                             |    16 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/base64.h                            |     6 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/cc.h                                |    44 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/ccmsg.h                             |    31 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/events.h                            |     9 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/result.h                            |    19 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/sexpr.h                             |    28 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/symtab.h                            |    40 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/symtype.h                           |    11 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/types.h                             |     7 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/util.h                              |   211 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/version.h                           |     3 +-
 external/mpl/bind/dist/lib/isccc/result.c                                          |    35 +-
 external/mpl/bind/dist/lib/isccc/sexpr.c                                           |    66 +-
 external/mpl/bind/dist/lib/isccc/symtab.c                                          |   134 +-
 external/mpl/bind/dist/lib/isccc/tests/result_test.c                               |    20 +-
 external/mpl/bind/dist/lib/isccc/version.c                                         |     5 +-
 external/mpl/bind/dist/lib/isccc/win32/DLLMain.c                                   |    12 +-
 external/mpl/bind/dist/lib/isccc/win32/version.c                                   |     4 +-
 external/mpl/bind/dist/lib/isccfg/aclconf.c                                        |   585 +-
 external/mpl/bind/dist/lib/isccfg/dnsconf.c                                        |    35 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/aclconf.h                         |    22 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/cfg.h                             |    96 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/dnsconf.h                         |     3 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/grammar.h                         |   258 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/kaspconf.h                        |     2 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/log.h                             |     9 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/namedconf.h                       |     5 +-
 external/mpl/bind/dist/lib/isccfg/include/isccfg/version.h                         |     3 +-
 external/mpl/bind/dist/lib/isccfg/kaspconf.c                                       |     2 +-
 external/mpl/bind/dist/lib/isccfg/log.c                                            |    14 +-
 external/mpl/bind/dist/lib/isccfg/namedconf.c                                      |  2416 +-
 external/mpl/bind/dist/lib/isccfg/parser.c                                         |  1548 +-
 external/mpl/bind/dist/lib/isccfg/tests/duration_test.c                            |     4 +-
 external/mpl/bind/dist/lib/isccfg/tests/parser_test.c                              |   157 +-
 external/mpl/bind/dist/lib/isccfg/version.c                                        |     5 +-
 external/mpl/bind/dist/lib/isccfg/win32/DLLMain.c                                  |    15 +-
 external/mpl/bind/dist/lib/isccfg/win32/version.c                                  |     5 +-
 external/mpl/bind/dist/lib/ns/Makefile.in                                          |     4 +-
 external/mpl/bind/dist/lib/ns/client.c                                             |  3128 +--
 external/mpl/bind/dist/lib/ns/hooks.c                                              |   155 +-
 external/mpl/bind/dist/lib/ns/include/ns/client.h                                  |   367 +-
 external/mpl/bind/dist/lib/ns/include/ns/hooks.h                                   |    46 +-
 external/mpl/bind/dist/lib/ns/include/ns/interfacemgr.h                            |    82 +-
 external/mpl/bind/dist/lib/ns/include/ns/lib.h                                     |     4 +-
 external/mpl/bind/dist/lib/ns/include/ns/listenlist.h                              |    26 +-
 external/mpl/bind/dist/lib/ns/include/ns/log.h                                     |    40 +-
 external/mpl/bind/dist/lib/ns/include/ns/notify.h                                  |     3 +-
 external/mpl/bind/dist/lib/ns/include/ns/query.h                                   |   216 +-
 external/mpl/bind/dist/lib/ns/include/ns/server.h                                  |   142 +-
 external/mpl/bind/dist/lib/ns/include/ns/sortlist.h                                |    15 +-
 external/mpl/bind/dist/lib/ns/include/ns/stats.h                                   |   147 +-
 external/mpl/bind/dist/lib/ns/include/ns/types.h                                   |    31 +-
 external/mpl/bind/dist/lib/ns/include/ns/update.h                                  |     8 +-
 external/mpl/bind/dist/lib/ns/include/ns/xfrout.h                                  |     6 +-
 external/mpl/bind/dist/lib/ns/interfacemgr.c                                       |   793 +-
 external/mpl/bind/dist/lib/ns/lib.c                                                |    49 +-
 external/mpl/bind/dist/lib/ns/listenlist.c                                         |    47 +-
 external/mpl/bind/dist/lib/ns/log.c                                                |    36 +-
 external/mpl/bind/dist/lib/ns/notify.c                                             |    29 +-
 external/mpl/bind/dist/lib/ns/pfilter.c                                            |    16 +-
 external/mpl/bind/dist/lib/ns/query.c                                              |  3449 ++-
 external/mpl/bind/dist/lib/ns/server.c                                             |   115 +-
 external/mpl/bind/dist/lib/ns/sortlist.c                                           |    50 +-
 external/mpl/bind/dist/lib/ns/stats.c                                              |    58 +-
 external/mpl/bind/dist/lib/ns/tests/listenlist_test.c                              |    33 +-
 external/mpl/bind/dist/lib/ns/tests/notify_test.c                                  |    43 +-
 external/mpl/bind/dist/lib/ns/tests/nstest.c                                       |   279 +-
 external/mpl/bind/dist/lib/ns/tests/nstest.h                                       |    33 +-
 external/mpl/bind/dist/lib/ns/tests/plugin_test.c                                  |    50 +-
 external/mpl/bind/dist/lib/ns/tests/query_test.c                                   |   130 +-
 external/mpl/bind/dist/lib/ns/tests/wrap.c                                         |     2 +-
 external/mpl/bind/dist/lib/ns/update.c                                             |  1463 +-
 external/mpl/bind/dist/lib/ns/version.c                                            |     3 +-
 external/mpl/bind/dist/lib/ns/win32/DLLMain.c                                      |    12 +-
 external/mpl/bind/dist/lib/ns/win32/version.c                                      |     3 +-
 external/mpl/bind/dist/lib/ns/xfrout.c                                             |   813 +-
 external/mpl/bind/dist/lib/samples/nsprobe.c                                       |   435 +-
 external/mpl/bind/dist/lib/samples/resolve.c                                       |   172 +-
 external/mpl/bind/dist/lib/samples/sample-async.c                                  |   146 +-
 external/mpl/bind/dist/lib/samples/sample-gai.c                                    |    34 +-
 external/mpl/bind/dist/lib/samples/sample-request.c                                |    64 +-
 external/mpl/bind/dist/lib/samples/sample-update.c                                 |   242 +-
 external/mpl/bind/dist/lib/win32/bindevt/bindevt.c                                 |     8 +-
 external/mpl/bind/include/config.h                                                 |    69 +-
 external/mpl/bind/include/dns/code.h                                               |     2 +-
 external/mpl/bind/include/dns/enumclass.h                                          |     2 +-
 external/mpl/bind/include/dns/enumtype.h                                           |     2 +-
 external/mpl/bind/include/dns/rdatastruct.h                                        |  1090 +-
 external/mpl/bind/include/isc/atomic.h                                             |    58 +-
 external/mpl/bind/include/isc/platform.h                                           |    26 +-
 external/mpl/bind/include/isc/stdatomic.h                                          |   183 +-
 external/mpl/bind/lib/libbind9/shlib_version                                       |     4 +-
 external/mpl/bind/lib/libdns/Makefile                                              |     6 +-
 external/mpl/bind/lib/libdns/shlib_version                                         |     4 +-
 external/mpl/bind/lib/libirs/shlib_version                                         |     4 +-
 external/mpl/bind/lib/libisc/Makefile                                              |    26 +-
 external/mpl/bind/lib/libisc/shlib_version                                         |     4 +-
 external/mpl/bind/lib/libisccc/shlib_version                                       |     4 +-
 external/mpl/bind/lib/libisccfg/Makefile                                           |     4 +-
 external/mpl/bind/lib/libisccfg/shlib_version                                      |     4 +-
 external/mpl/bind/lib/libns/shlib_version                                          |     4 +-
 1230 files changed, 99643 insertions(+), 101945 deletions(-)

diffs (truncated from 386445 to 300 lines):

diff -r 419293b7c634 -r c7f766e879c2 external/mpl/bind/Makefile.inc
--- a/external/mpl/bind/Makefile.inc    Sun May 24 19:36:26 2020 +0000
+++ b/external/mpl/bind/Makefile.inc    Sun May 24 19:46:10 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.5 2019/09/09 14:40:39 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2020/05/24 19:46:10 christos Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -33,6 +33,8 @@
 SYSCONFDIR=/etc
 LOCALSTATEDIR=/var
 
+LINTFLAGS+=-Z-include -Z${BIND_SRCDIR}/include/config.h
+CPPFLAGS+=-include ${BIND_SRCDIR}/include/config.h
 CPPFLAGS+=-I${BIND_SRCDIR}/include \
        -I${IDIST} \
        -I${IDIST}/lib/bind9/include \
@@ -45,6 +47,7 @@
        -DNS_LOCALSTATEDIR=\"${LOCALSTATEDIR}\" \
        -DNS_SYSCONFDIR=\"${SYSCONFDIR}\" \
        -DSESSION_KEYFILE=\"${LOCALSTATEDIR}/run/named/session.key\" \
+       -DNAMED_CONFFILE=\"${SYSCONFDIR}/named.conf\" \
        -DVERSION=\"${VERSION}\" -DBIND9
 
 .if (${USE_INET6} != "no")
@@ -67,8 +70,8 @@
 .else
 LDADD+=                -lbind9 -lisccfg -ldns -lns -lirs
 DPADD+=                ${LIBBIND9} ${LIBISCCFG} ${LIBDNS} ${LIBNS} ${LIBIRS}
-LDADD+=                -lisccc -lisc -lz
-DPADD+=                ${LIBISCCC} ${LIBISC} ${LIBZ}
+LDADD+=                -lisccc -lisc -luv -lz
+DPADD+=                ${LIBISCCC} ${LIBISC} ${LIBUV} ${LIBZ}
 .endif
 .else
 CPPFLAGS+= -DLIBINTERFACE=${LIBINTERFACE} \
diff -r 419293b7c634 -r c7f766e879c2 external/mpl/bind/bind2netbsd
--- a/external/mpl/bind/bind2netbsd     Sun May 24 19:36:26 2020 +0000
+++ b/external/mpl/bind/bind2netbsd     Sun May 24 19:46:10 2020 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#      $NetBSD: bind2netbsd,v 1.5 2019/11/27 05:48:39 christos Exp $
+#      $NetBSD: bind2netbsd,v 1.6 2020/05/24 19:46:10 christos Exp $
 #
 # Copyright (c) 2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -119,7 +119,21 @@
 echo "cleaning up CVS residue."
 (
        cd $d
-       find . -type d -name "CVS" -print | xargs rm -r
+       find . -type d -name "CVS" -exec rm -r {} +
+)
+echo done
+
+echo "cleaning up GIT residue."
+(
+       cd $d
+       find . -type d -name ".gitattributes" -exec rm {} +
+)
+echo done
+
+echo "cleaning up clang-format residue."
+(
+       cd $d
+       find . -type d -name ".clang-format*" -exec rm {} +
 )
 echo done
 
diff -r 419293b7c634 -r c7f766e879c2 external/mpl/bind/dist/Makefile.in
--- a/external/mpl/bind/dist/Makefile.in        Sun May 24 19:36:26 2020 +0000
+++ b/external/mpl/bind/dist/Makefile.in        Sun May 24 19:46:10 2020 +0000
@@ -18,11 +18,7 @@
 TARGETS =
 PREREQS =      bind.keys.h
 
-MANPAGES =     isc-config.sh.1
-
-HTMLPAGES =    isc-config.sh.html
-
-MANOBJS =      README HISTORY OPTIONS CONTRIBUTING PLATFORMS \
+MANOBJS =      README HISTORY OPTIONS CONTRIBUTING PLATFORMS CODE_OF_CONDUCT \
                ${MANPAGES} ${HTMLPAGES}
 
 @BIND9_MAKE_RULES@
@@ -35,7 +31,7 @@
 
 distclean::
        rm -f config.cache config.h config.log config.status TAGS
-       rm -f libtool isc-config.sh configure.lineno
+       rm -f libtool configure.lineno
        rm -f util/conf.sh docutil/docbook2man-wrapper.sh
 
 # XXX we should clean libtool stuff too.  Only do this after we add rules
@@ -54,25 +50,11 @@
        ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir}
        $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
 
-install:: isc-config.sh installdirs
-       ${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir}
-       rm -f ${DESTDIR}${bindir}/bind9-config
-       @LN@ ${DESTDIR}${bindir}/isc-config.sh ${DESTDIR}${bindir}/bind9-config
-       ${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1
-       rm -f ${DESTDIR}${mandir}/man1/bind9-config.1
-       @LN@ ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1
+install:: installdirs
        ${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir}
 
 uninstall::
        rm -f ${DESTDIR}${sysconfdir}/bind.keys
-       rm -f ${DESTDIR}${mandir}/man1/bind9-config.1
-       rm -f ${DESTDIR}${mandir}/man1/isc-config.sh.1
-       rm -f ${DESTDIR}${bindir}/bind9-config
-       rm -f ${DESTDIR}${bindir}/isc-config.sh
-
-tags:
-       rm -f TAGS
-       find lib bin -name "*.[ch]" -print | @ETAGS@ -
 
 test check:
        @if test -n "`${PERL} ${top_srcdir}/bin/tests/system/testsock.pl 2>/dev/null || echo fail`"; then \
@@ -121,6 +103,11 @@
                ${W3M} -dump -cols 75 -O ascii -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
+CODE_OF_CONDUCT: CODE_OF_CONDUCT.md
+       ${PANDOC} --email-obfuscation=none -s --metadata title="CODE OF CONDUCT" -f markdown-smart -t html CODE_OF_CONDUCT.md | \
+               ${W3M} -dump -cols 75 -O ascii -T text/html | \
+               sed -e '$${/^$$/d;}' > $@
+
 unit::
        sh ${top_builddir}/unit/unittest.sh
 
diff -r 419293b7c634 -r c7f766e879c2 external/mpl/bind/dist/bin/check/check-tool.c
--- a/external/mpl/bind/dist/bin/check/check-tool.c     Sun May 24 19:36:26 2020 +0000
+++ b/external/mpl/bind/dist/bin/check/check-tool.c     Sun May 24 19:46:10 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: check-tool.c,v 1.4 2019/11/27 05:48:39 christos Exp $  */
+/*     $NetBSD: check-tool.c,v 1.5 2020/05/24 19:46:10 christos Exp $  */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -11,25 +11,21 @@
  * information regarding copyright ownership.
  */
 
-
 /*! \file */
 
-#include <config.h>
-
+#include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <inttypes.h>
 
 #ifdef _WIN32
 #include <Winsock2.h>
-#endif
+#endif /* ifdef _WIN32 */
 
-#include "check-tool.h"
 #include <isc/buffer.h>
 #include <isc/log.h>
 #include <isc/mem.h>
+#include <isc/net.h>
 #include <isc/netdb.h>
-#include <isc/net.h>
 #include <isc/print.h>
 #include <isc/region.h>
 #include <isc/stdio.h>
@@ -56,29 +52,31 @@
 
 #include <ns/log.h>
 
+#include "check-tool.h"
+
 #ifndef CHECK_SIBLING
 #define CHECK_SIBLING 1
-#endif
+#endif /* ifndef CHECK_SIBLING */
 
 #ifndef CHECK_LOCAL
 #define CHECK_LOCAL 1
-#endif
+#endif /* ifndef CHECK_LOCAL */
 
-#define CHECK(r) \
-       do { \
-               result = (r); \
+#define CHECK(r)                             \
+       do {                                 \
+               result = (r);                \
                if (result != ISC_R_SUCCESS) \
-                       goto cleanup; \
+                       goto cleanup;        \
        } while (/*CONSTCOND*/0)
 
-#define ERR_IS_CNAME 1
-#define ERR_NO_ADDRESSES 2
+#define ERR_IS_CNAME      1
+#define ERR_NO_ADDRESSES   2
 #define ERR_LOOKUP_FAILURE 3
-#define ERR_EXTRA_A 4
-#define ERR_EXTRA_AAAA 5
-#define ERR_MISSING_GLUE 5
-#define ERR_IS_MXCNAME 6
-#define ERR_IS_SRVCNAME 7
+#define ERR_EXTRA_A       4
+#define ERR_EXTRA_AAAA    5
+#define ERR_MISSING_GLUE   5
+#define ERR_IS_MXCNAME    6
+#define ERR_IS_SRVCNAME           7
 
 static const char *dbtype[] = { "rbt" };
 
@@ -89,31 +87,26 @@
 bool docheckmx = true;
 bool dochecksrv = true;
 bool docheckns = true;
-#else
+#else  /* if CHECK_LOCAL */
 bool docheckmx = false;
 bool dochecksrv = false;
 bool docheckns = false;
-#endif
-dns_zoneopt_t zone_options = DNS_ZONEOPT_CHECKNS |
-                            DNS_ZONEOPT_CHECKMX |
-                            DNS_ZONEOPT_MANYERRORS |
-                            DNS_ZONEOPT_CHECKNAMES |
+#endif /* if CHECK_LOCAL */
+dns_zoneopt_t zone_options = DNS_ZONEOPT_CHECKNS | DNS_ZONEOPT_CHECKMX |
+                            DNS_ZONEOPT_MANYERRORS | DNS_ZONEOPT_CHECKNAMES |
                             DNS_ZONEOPT_CHECKINTEGRITY |
 #if CHECK_SIBLING
                             DNS_ZONEOPT_CHECKSIBLING |
-#endif
+#endif /* if CHECK_SIBLING */
                             DNS_ZONEOPT_CHECKWILDCARD |
-                            DNS_ZONEOPT_WARNMXCNAME |
-                            DNS_ZONEOPT_WARNSRVCNAME;
+                            DNS_ZONEOPT_WARNMXCNAME | DNS_ZONEOPT_WARNSRVCNAME;
 
 /*
  * This needs to match the list in bin/named/log.c.
  */
-static isc_logcategory_t categories[] = {
-       { "",                0 },
-       { "unmatched",       0 },
-       { NULL,              0 }
-};
+static isc_logcategory_t categories[] = { { "", 0 },
+                                         { "unmatched", 0 },
+                                         { NULL, 0 } };
 
 static isc_symtab_t *symtab = NULL;
 static isc_mem_t *sym_mctx;
@@ -131,46 +124,45 @@
        isc_symvalue_t symvalue;
 
        if (sym_mctx == NULL) {
-               result = isc_mem_create(0, 0, &sym_mctx);
-               if (result != ISC_R_SUCCESS)
-                       return;
+               isc_mem_create(&sym_mctx);
        }
 
        if (symtab == NULL) {
                result = isc_symtab_create(sym_mctx, 100, freekey, sym_mctx,
                                           false, &symtab);
-               if (result != ISC_R_SUCCESS)
+               if (result != ISC_R_SUCCESS) {
                        return;
+               }
        }
 
        key = isc_mem_strdup(sym_mctx, key);
-       if (key == NULL)
-               return;
 
        symvalue.as_pointer = NULL;
        result = isc_symtab_define(symtab, key, value, symvalue,
                                   isc_symexists_reject);
-       if (result != ISC_R_SUCCESS)
+       if (result != ISC_R_SUCCESS) {
                isc_mem_free(sym_mctx, key);
+       }
 }
 
 static bool
 logged(char *key, int value) {
        isc_result_t result;
 
-       if (symtab == NULL)
+       if (symtab == NULL) {
                return (false);
+       }
 



Home | Main Index | Thread Index | Old Index