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/ce57707e9d97
branches:  trunk
changeset: 464701:ce57707e9d97
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Oct 17 16:46:57 2019 +0000

description:
merge conflicts

diffstat:

 external/mpl/bind/bind2netbsd                                          |    5 +-
 external/mpl/bind/dist/bin/dig/dighost.c                               |   20 +-
 external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c                   |   70 +-
 external/mpl/bind/dist/bin/named/config.c                              |    4 +-
 external/mpl/bind/dist/bin/named/main.c                                |   18 +-
 external/mpl/bind/dist/bin/named/server.c                              |   83 +-
 external/mpl/bind/dist/bin/named/statschannel.c                        |   10 +-
 external/mpl/bind/dist/bin/named/win32/os.c                            |   12 +-
 external/mpl/bind/dist/bin/named/zoneconf.c                            |   68 +-
 external/mpl/bind/dist/bin/pkcs11/Makefile                             |  507 ----------
 external/mpl/bind/dist/bin/tests/optional/nsecify.c                    |    5 +-
 external/mpl/bind/dist/bin/tests/pkcs11/Makefile                       |  436 --------
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/Makefile            |  478 ---------
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/create.c            |   10 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/find.c              |   10 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/genrsa.c            |   10 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/login.c             |   10 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/privrsa.c           |   10 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/pubrsa.c            |   10 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/session.c           |   10 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sha1.c              |   10 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/sign.c              |   10 +-
 external/mpl/bind/dist/bin/tests/pkcs11/benchmarks/verify.c            |   12 +-
 external/mpl/bind/dist/bin/tests/system/dlzexternal/ns1/dlzs.conf      |   33 -
 external/mpl/bind/dist/bin/tests/system/glue/ns1/cache.in              |   15 -
 external/mpl/bind/dist/bin/tests/system/glue/ns1/mil.db                |   23 -
 external/mpl/bind/dist/bin/tests/system/glue/xx.good                   |   16 -
 external/mpl/bind/dist/bin/tests/system/glue/yy.good                   |   17 -
 external/mpl/bind/dist/bin/tests/virtual-time/Makefile                 |   38 -
 external/mpl/bind/dist/bin/tests/virtual-time/conf.sh                  |   42 -
 external/mpl/bind/dist/bin/tools/mdig.c                                |    4 +-
 external/mpl/bind/dist/bin/win32/BINDInstall/resource.h                |    3 +-
 external/mpl/bind/dist/config.h.in                                     |    3 -
 external/mpl/bind/dist/configure                                       |  218 +----
 external/mpl/bind/dist/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c |   28 +-
 external/mpl/bind/dist/contrib/scripts/check-secure-delegation.pl      |  114 --
 external/mpl/bind/dist/contrib/scripts/zone-edit.sh                    |  151 --
 external/mpl/bind/dist/doc/arm/Bv9ARM.pdf                              |  Bin 
 external/mpl/bind/dist/fuzz/dns_rdata_fromwire_text.c                  |    7 +-
 external/mpl/bind/dist/lib/dns/dnssec.c                                |   36 +-
 external/mpl/bind/dist/lib/dns/dst_api.c                               |    4 +-
 external/mpl/bind/dist/lib/dns/ecdb.c                                  |    6 +-
 external/mpl/bind/dist/lib/dns/include/dns/message.h                   |    3 +-
 external/mpl/bind/dist/lib/dns/message.c                               |   65 +-
 external/mpl/bind/dist/lib/dns/name.c                                  |   13 +-
 external/mpl/bind/dist/lib/dns/nsec.c                                  |    4 +-
 external/mpl/bind/dist/lib/dns/openssldh_link.c                        |    4 +-
 external/mpl/bind/dist/lib/dns/opensslrsa_link.c                       |    4 +-
 external/mpl/bind/dist/lib/dns/rbt.c                                   |   29 +-
 external/mpl/bind/dist/lib/dns/rcode.c                                 |   18 +-
 external/mpl/bind/dist/lib/dns/rdata/generic/opt_41.c                  |    8 +-
 external/mpl/bind/dist/lib/dns/resolver.c                              |   48 +-
 external/mpl/bind/dist/lib/dns/rpz.c                                   |   43 +-
 external/mpl/bind/dist/lib/dns/sdb.c                                   |   80 +-
 external/mpl/bind/dist/lib/dns/tests/rbt_serialize_test.c              |    4 +-
 external/mpl/bind/dist/lib/dns/tests/tkey_test.c                       |  189 ---
 external/mpl/bind/dist/lib/dns/ttl.c                                   |    3 +-
 external/mpl/bind/dist/lib/dns/zone.c                                  |  125 +-
 external/mpl/bind/dist/lib/dns/zoneverify.c                            |   72 +-
 external/mpl/bind/dist/lib/irs/win32/resconf.c                         |    3 +-
 external/mpl/bind/dist/lib/isc/include/isc/siphash.h                   |    4 +-
 external/mpl/bind/dist/lib/isc/include/isc/socket.h                    |    4 +-
 external/mpl/bind/dist/lib/isc/lex.c                                   |    3 +-
 external/mpl/bind/dist/lib/isc/ratelimiter.c                           |    4 +-
 external/mpl/bind/dist/lib/isc/siphash.c                               |  105 +-
 external/mpl/bind/dist/lib/isc/sockaddr.c                              |    3 +-
 external/mpl/bind/dist/lib/isc/tests/hmac_test.c                       |    4 +-
 external/mpl/bind/dist/lib/isc/tests/md_test.c                         |    4 +-
 external/mpl/bind/dist/lib/isc/tests/queue_test.c                      |    4 +-
 external/mpl/bind/dist/lib/isc/tests/random_test.c                     |    5 +-
 external/mpl/bind/dist/lib/isc/tests/siphash_test.c                    |   58 +-
 external/mpl/bind/dist/lib/isc/tests/task_test.c                       |    4 +-
 external/mpl/bind/dist/lib/isc/unix/resource.c                         |    3 +-
 external/mpl/bind/dist/lib/isc/unix/socket.c                           |   13 +-
 external/mpl/bind/dist/lib/isc/win32/file.c                            |    4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/stdatomic.h           |    4 +-
 external/mpl/bind/dist/lib/isc/win32/ntgroups.c                        |  103 +-
 external/mpl/bind/dist/lib/isc/win32/socket.c                          |   94 +-
 external/mpl/bind/dist/lib/isc/win32/time.c                            |   15 +-
 external/mpl/bind/dist/lib/isccfg/namedconf.c                          |    5 +-
 external/mpl/bind/dist/lib/isccfg/parser.c                             |    4 +-
 external/mpl/bind/dist/lib/ns/client.c                                 |   45 +-
 external/mpl/bind/dist/lib/samples/Makefile-postinstall                |  437 --------
 external/mpl/bind/dist/unit/unittest.sh                                |   27 -
 external/mpl/bind/include/config.h                                     |    1 +
 85 files changed, 1046 insertions(+), 3202 deletions(-)

diffs (truncated from 6341 to 300 lines):

diff -r d0e52e27b1e3 -r ce57707e9d97 external/mpl/bind/bind2netbsd
--- a/external/mpl/bind/bind2netbsd     Thu Oct 17 16:25:39 2019 +0000
+++ b/external/mpl/bind/bind2netbsd     Thu Oct 17 16:46:57 2019 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#      $NetBSD: bind2netbsd,v 1.3 2019/02/24 20:01:26 christos Exp $
+#      $NetBSD: bind2netbsd,v 1.4 2019/10/17 16:46:57 christos Exp $
 #
 # Copyright (c) 2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -36,7 +36,8 @@
 #      $ tar xpfz /new/bind/release/tar/file
 #      $ sh /usr/src/external/mpl/bind/bind2netbsd bind-9.x.y `pwd`
 #      $ cd src/external/mpl/bind/dist
-#      $ cvs -d cvs.netbsd.org:/cvsroot import -m "Import bind 9.x.y" src/external/mpl/bind/dist ISC bind-9-x-y
+#      $ cvs -d cvs.netbsd.org:/cvsroot import src/external/mpl/bind/dist ISC bind-9-x-y
+#      Enter the new CHANGES portion as your commit message
 #      $ cd ../../../../../bind-9.x.y
 #      $ run ./configure --enable-dnsrps --enable-querytrace --enable-fixed-rrset
 #      $ run make
diff -r d0e52e27b1e3 -r ce57707e9d97 external/mpl/bind/dist/bin/dig/dighost.c
--- a/external/mpl/bind/dist/bin/dig/dighost.c  Thu Oct 17 16:25:39 2019 +0000
+++ b/external/mpl/bind/dist/bin/dig/dighost.c  Thu Oct 17 16:46:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dighost.c,v 1.5 2019/09/05 19:32:55 christos Exp $     */
+/*     $NetBSD: dighost.c,v 1.6 2019/10/17 16:46:58 christos Exp $     */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1401,6 +1401,7 @@
 } dig_ednsoptname_t;
 
 dig_ednsoptname_t optnames[] = {
+       { 1, "LLQ" },           /* draft-sekar-dns-llq */
        { 3, "NSID" },          /* RFC 5001 */
        { 5, "DAU" },           /* RFC 6975 */
        { 6, "DHU" },           /* RFC 6975 */
@@ -4380,9 +4381,20 @@
         */
        res = idn2_to_unicode_8zlz(utf8_src, &local_src, 0);
        if (res != IDN2_OK) {
-               fatal("Cannot represent '%s' in the current locale (%s), "
-                     "use +noidnout or a different locale",
-                     src, idn2_strerror(res));
+               static bool warned = false;
+
+               res = idn2_to_ascii_8z(utf8_src, &local_src, 0);
+               if (res != IDN2_OK) {
+                       fatal("Cannot represent '%s' "
+                             "in the current locale nor ascii (%s), "
+                             "use +noidnout or a different locale",
+                             src, idn2_strerror(res));
+               } else if (!warned) {
+                       fprintf(stderr, ";; Warning: cannot represent '%s' "
+                             "in the current locale",
+                             local_src);
+                       warned = true;
+               }
        }
 
        /*
diff -r d0e52e27b1e3 -r ce57707e9d97 external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c
--- a/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c      Thu Oct 17 16:25:39 2019 +0000
+++ b/external/mpl/bind/dist/bin/dnssec/dnssec-dsfromkey.c      Thu Oct 17 16:46:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dnssec-dsfromkey.c,v 1.5 2019/04/28 00:01:13 christos Exp $    */
+/*     $NetBSD: dnssec-dsfromkey.c,v 1.6 2019/10/17 16:46:58 christos Exp $    */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -364,12 +364,14 @@
 
        dns_rdata_init(&rdata);
 
-       if (argc == 1)
+       if (argc == 1) {
                usage();
+       }
 
        result = isc_mem_create(0, 0, &mctx);
-       if (result != ISC_R_SUCCESS)
+       if (result != ISC_R_SUCCESS) {
                fatal("out of memory");
+       }
 
 #if USE_PKCS11
        pk11_result_register();
@@ -397,9 +399,10 @@
                        both = false;
                        break;
                case 'C':
-                       if (lookaside != NULL)
+                       if (lookaside != NULL) {
                                fatal("lookaside and CDS are mutually"
                                      " exclusive");
+                       }
                        cds = true;
                        break;
                case 'c':
@@ -411,16 +414,18 @@
                        /* fall through */
                case 'K':
                        dir = isc_commandline_argument;
-                       if (strlen(dir) == 0U)
+                       if (strlen(dir) == 0U) {
                                fatal("directory must be non-empty string");
+                       }
                        break;
                case 'f':
                        filename = isc_commandline_argument;
                        break;
                case 'l':
-                       if (cds)
+                       if (cds) {
                                fatal("lookaside and CDS are mutually"
                                      " exclusive");
+                       }
                        lookaside = isc_commandline_argument;
                        if (strlen(lookaside) == 0U)
                                fatal("lookaside must be a non-empty string");
@@ -434,16 +439,18 @@
                        break;
                case 'v':
                        verbose = strtol(isc_commandline_argument, &endp, 0);
-                       if (*endp != '\0')
+                       if (*endp != '\0') {
                                fatal("-v must be followed by a number");
+                       }
                        break;
                case 'F':
                        /* Reserved for FIPS mode */
                        /* FALLTHROUGH */
                case '?':
-                       if (isc_commandline_option != '?')
+                       if (isc_commandline_option != '?') {
                                fprintf(stderr, "%s: invalid argument -%c\n",
                                        program, isc_commandline_option);
+                       }
                        /* FALLTHROUGH */
                case 'h':
                        /* Does not return. */
@@ -462,46 +469,56 @@
 
        rdclass = strtoclass(classname);
 
-       if (usekeyset && filename != NULL)
+       if (usekeyset && filename != NULL) {
                fatal("cannot use both -s and -f");
+       }
 
        /* When not using -f, -A is implicit */
-       if (filename == NULL)
+       if (filename == NULL) {
                showall = true;
+       }
 
-       if (argc < isc_commandline_index + 1 && filename == NULL)
+       if (argc < isc_commandline_index + 1 && filename == NULL) {
                fatal("the key file name was not specified");
-       if (argc > isc_commandline_index + 1)
+       }
+       if (argc > isc_commandline_index + 1) {
                fatal("extraneous arguments");
+       }
 
        result = dst_lib_init(mctx, NULL);
-       if (result != ISC_R_SUCCESS)
+       if (result != ISC_R_SUCCESS) {
                fatal("could not initialize dst: %s",
                      isc_result_totext(result));
+       }
 
        setup_logging(mctx, &log);
 
        dns_rdataset_init(&rdataset);
 
        if (usekeyset || filename != NULL) {
-               if (argc < isc_commandline_index + 1 && filename != NULL) {
+               if (argc < isc_commandline_index + 1) {
                        /* using zone name as the zone file name */
                        namestr = filename;
-               } else
+               } else {
                        namestr = argv[isc_commandline_index];
+               }
 
                result = initname(namestr);
-               if (result != ISC_R_SUCCESS)
+               if (result != ISC_R_SUCCESS) {
                        fatal("could not initialize name %s", namestr);
+               }
 
-               if (usekeyset)
+               if (usekeyset) {
                        result = loadkeyset(dir, &rdataset);
-               else
+               } else {
+                       INSIST(filename != NULL);
                        result = loadset(filename, &rdataset);
+               }
 
-               if (result != ISC_R_SUCCESS)
+               if (result != ISC_R_SUCCESS) {
                        fatal("could not load DNSKEY set: %s\n",
                              isc_result_totext(result));
+               }
 
                for (result = dns_rdataset_first(&rdataset);
                     result == ISC_R_SUCCESS;
@@ -509,16 +526,18 @@
                        dns_rdata_init(&rdata);
                        dns_rdataset_current(&rdataset, &rdata);
 
-                       if (verbose > 2)
+                       if (verbose > 2) {
                                logkey(&rdata);
+                       }
 
                        if (both) {
                                emit(DNS_DSDIGEST_SHA1, showall, lookaside,
                                     cds, &rdata);
                                emit(DNS_DSDIGEST_SHA256, showall, lookaside,
                                     cds, &rdata);
-                       } else
+                       } else {
                                emit(dtype, showall, lookaside, cds, &rdata);
+                       }
                }
        } else {
                unsigned char key_buf[DST_KEY_MAXSIZE];
@@ -531,8 +550,9 @@
                             &rdata);
                        emit(DNS_DSDIGEST_SHA256, showall, lookaside, cds,
                             &rdata);
-               } else
+               } else {
                        emit(dtype, showall, lookaside, cds, &rdata);
+               }
        }
 
        if (dns_rdataset_isassociated(&rdataset))
@@ -540,14 +560,16 @@
        cleanup_logging(&log);
        dst_lib_destroy();
        dns_name_destroy();
-       if (verbose > 10)
+       if (verbose > 10) {
                isc_mem_stats(mctx, stdout);
+       }
        isc_mem_destroy(&mctx);
 
        fflush(stdout);
        if (ferror(stdout)) {
                fprintf(stderr, "write error\n");
                return (1);
-       } else
+       } else {
                return (0);
+       }
 }
diff -r d0e52e27b1e3 -r ce57707e9d97 external/mpl/bind/dist/bin/named/config.c
--- a/external/mpl/bind/dist/bin/named/config.c Thu Oct 17 16:25:39 2019 +0000
+++ b/external/mpl/bind/dist/bin/named/config.c Thu Oct 17 16:46:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: config.c,v 1.5 2019/09/05 19:32:55 christos Exp $      */
+/*     $NetBSD: config.c,v 1.6 2019/10/17 16:46:58 christos Exp $      */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -885,7 +885,9 @@
        if (stack != NULL)
                isc_mem_put(mctx, stack, stackcount * sizeof(*stack));
 
+       INSIST(dscpcount == addrcount);
        INSIST(keycount == addrcount);
+       INSIST(keycount == dscpcount);
 
        ipkl->addrs = addrs;
        ipkl->dscps = dscps;
diff -r d0e52e27b1e3 -r ce57707e9d97 external/mpl/bind/dist/bin/named/main.c
--- a/external/mpl/bind/dist/bin/named/main.c   Thu Oct 17 16:25:39 2019 +0000
+++ b/external/mpl/bind/dist/bin/named/main.c   Thu Oct 17 16:46:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.5 2019/09/09 14:40:39 christos Exp $        */
+/*     $NetBSD: main.c,v 1.6 2019/10/17 16:46:58 christos Exp $        */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -363,7 +363,7 @@
                         * nearly always be fine.
                         */
                        if (quoted || isalnum(*src & 0xff) ||
-                           *src == '-' || *src == '_' ||
+                           *src == ',' || *src == '-' || *src == '_' ||
                            *src == '.' || *src == '/') {
                                *dst++ = *src++;
                                quoted = false;
@@ -616,6 +616,9 @@
                maxudp = 1460;



Home | Main Index | Thread Index | Old Index