diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 6c0dcb1f0d..54f7f81e33 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -487,7 +487,8 @@ dns64prefix_answer(dns_message_t *msg, isc_buffer_t *buf) { size_t i, count = 10; name = dns_fixedname_initname(&fixed); - result = dns_name_fromstring(name, "ipv4only.arpa", 0, NULL); + result = dns_name_fromstring(name, "ipv4only.arpa", dns_rootname, 0, + NULL); check_result(result, "dns_name_fromstring"); result = dns_message_findname(msg, DNS_SECTION_ANSWER, name, diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index bafa54bcd9..5e8e8422a5 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -2029,7 +2029,7 @@ next_origin(dig_lookup_t *oldlookup) { * Check for a absolute name or ndots being met. */ name = dns_fixedname_initname(&fixed); - result = dns_name_fromstring2(name, oldlookup->textname, NULL, 0, NULL); + result = dns_name_fromstring(name, oldlookup->textname, NULL, 0, NULL); if (result == ISC_R_SUCCESS && (dns_name_isabsolute(name) || (int)dns_name_countlabels(name) > ndots)) diff --git a/bin/named/server.c b/bin/named/server.c index 9536617488..324bc9587e 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -2194,7 +2194,8 @@ configure_rpz_name(dns_view_t *view, const cfg_obj_t *obj, dns_name_t *name, const char *str, const char *msg) { isc_result_t result; - result = dns_name_fromstring(name, str, DNS_NAME_DOWNCASE, view->mctx); + result = dns_name_fromstring(name, str, dns_rootname, DNS_NAME_DOWNCASE, + view->mctx); if (result != ISC_R_SUCCESS) { cfg_obj_log(obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL, "invalid %s '%s'", msg, str); @@ -2207,8 +2208,8 @@ configure_rpz_name2(dns_view_t *view, const cfg_obj_t *obj, dns_name_t *name, const char *str, const dns_name_t *origin) { isc_result_t result; - result = dns_name_fromstring2(name, str, origin, DNS_NAME_DOWNCASE, - view->mctx); + result = dns_name_fromstring(name, str, origin, DNS_NAME_DOWNCASE, + view->mctx); if (result != ISC_R_SUCCESS) { cfg_obj_log(obj, named_g_lctx, DNS_RPZ_ERROR_LEVEL, "invalid zone '%s'", str); @@ -3020,8 +3021,8 @@ configure_catz_zone(dns_view_t *view, dns_view_t *pview, str = cfg_obj_asstring(cfg_tuple_get(catz_obj, "zone name")); - result = dns_name_fromstring(&origin, str, DNS_NAME_DOWNCASE, - view->mctx); + result = dns_name_fromstring(&origin, str, dns_rootname, + DNS_NAME_DOWNCASE, view->mctx); if (result == ISC_R_SUCCESS && dns_name_equal(&origin, dns_rootname)) { result = DNS_R_EMPTYLABEL; } @@ -3415,7 +3416,7 @@ create_empty_zone(dns_zone_t *pzone, dns_name_t *name, dns_view_t *view, { zconfig = cfg_listelt_value(element); str = cfg_obj_asstring(cfg_tuple_get(zconfig, "name")); - CHECK(dns_name_fromstring(zname, str, 0, NULL)); + CHECK(dns_name_fromstring(zname, str, dns_rootname, 0, NULL)); namereln = dns_name_fullcompare(zname, name, &order, &nlabels); if (namereln != dns_namereln_subdomain) { continue; @@ -3446,10 +3447,11 @@ create_empty_zone(dns_zone_t *pzone, dns_name_t *name, dns_view_t *view, dns_name_clone(name, ns); } else { CHECK(dns_name_fromstring(ns, empty_dbtype[2], - 0, NULL)); + dns_rootname, 0, + NULL)); } - CHECK(dns_name_fromstring(contact, empty_dbtype[3], 0, - NULL)); + CHECK(dns_name_fromstring(contact, empty_dbtype[3], + dns_rootname, 0, NULL)); CHECK(add_soa(db, version, name, ns, contact)); CHECK(add_ns(db, version, name, ns)); } @@ -5648,7 +5650,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, result = named_config_get(maps, "empty-server", &obj); if (result == ISC_R_SUCCESS) { CHECK(dns_name_fromstring(name, cfg_obj_asstring(obj), - 0, NULL)); + dns_rootname, 0, NULL)); isc_buffer_init(&buffer, server, sizeof(server) - 1); CHECK(dns_name_totext(name, false, &buffer)); server[isc_buffer_usedlength(&buffer)] = 0; @@ -5661,7 +5663,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, result = named_config_get(maps, "empty-contact", &obj); if (result == ISC_R_SUCCESS) { CHECK(dns_name_fromstring(name, cfg_obj_asstring(obj), - 0, NULL)); + dns_rootname, 0, NULL)); isc_buffer_init(&buffer, contact, sizeof(contact) - 1); CHECK(dns_name_totext(name, false, &buffer)); contact[isc_buffer_usedlength(&buffer)] = 0; @@ -5701,7 +5703,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, /* * Look for zone on drop list. */ - CHECK(dns_name_fromstring(name, empty, 0, NULL)); + CHECK(dns_name_fromstring(name, empty, dns_rootname, 0, + NULL)); if (disablelist != NULL && on_disable_list(disablelist, name)) { @@ -5804,8 +5807,9 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, dns_forwarders_t *dnsforwarders = NULL; dns_fwdpolicy_t fwdpolicy = dns_fwdpolicy_none; - CHECK(dns_name_fromstring( - name, zones[ipv4only_zone].name, 0, NULL)); + CHECK(dns_name_fromstring(name, + zones[ipv4only_zone].name, + dns_rootname, 0, NULL)); (void)dns_view_findzone(view, name, DNS_ZTFIND_EXACT, &zone); @@ -5883,8 +5887,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, result = named_config_get(maps, "nxdomain-redirect", &obj); if (result == ISC_R_SUCCESS) { dns_name_t *name = dns_fixedname_name(&view->redirectfixed); - CHECK(dns_name_fromstring(name, cfg_obj_asstring(obj), 0, - NULL)); + CHECK(dns_name_fromstring(name, cfg_obj_asstring(obj), + dns_rootname, 0, NULL)); view->redirectzone = name; } else { view->redirectzone = NULL; @@ -5907,8 +5911,9 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, ntaname = dns_fixedname_initname(&fntaname); obj = cfg_listelt_value(element); - CHECK(dns_name_fromstring( - ntaname, cfg_obj_asstring(obj), 0, NULL)); + CHECK(dns_name_fromstring(ntaname, + cfg_obj_asstring(obj), + dns_rootname, 0, NULL)); CHECK(dns_ntatable_add(ntatable, ntaname, true, 0, 0xffffffffU)); } @@ -6158,7 +6163,8 @@ validate_tls(const cfg_obj_t *config, dns_view_t *view, const cfg_obj_t *obj, isc_log_t *logctx, const char *str, dns_name_t **name) { dns_fixedname_t fname; dns_name_t *nm = dns_fixedname_initname(&fname); - isc_result_t result = dns_name_fromstring(nm, str, 0, NULL); + isc_result_t result = dns_name_fromstring(nm, str, dns_rootname, 0, + NULL); if (result != ISC_R_SUCCESS) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, @@ -7155,7 +7161,7 @@ get_tat_qname(dns_name_t *target, dns_name_t *keyname, dns_keynode_t *keynode) { isc_textregion_consume(&r, m); } - return (dns_name_fromstring2(target, label, keyname, 0, NULL)); + return (dns_name_fromstring(target, label, keyname, 0, NULL)); } static void @@ -7759,7 +7765,7 @@ configure_zone_setviewcommit(isc_result_t result, const cfg_obj_t *zconfig, zname = cfg_obj_asstring(cfg_tuple_get(zconfig, "name")); origin = dns_fixedname_initname(&fixorigin); - result2 = dns_name_fromstring(origin, zname, 0, NULL); + result2 = dns_name_fromstring(origin, zname, dns_rootname, 0, NULL); if (result2 != ISC_R_SUCCESS) { return; } @@ -10460,7 +10466,7 @@ zone_from_args(named_server_t *server, isc_lex_t *lex, const char *zonetxt, } name = dns_fixedname_initname(&fname); - CHECK(dns_name_fromstring(name, zonebuf, 0, NULL)); + CHECK(dns_name_fromstring(name, zonebuf, dns_rootname, 0, NULL)); /* Look for the optional class name. */ classtxt = next_token(lex, text); @@ -13347,7 +13353,7 @@ delete_zoneconf(dns_view_t *view, cfg_parser_t *pctx, const cfg_obj_t *config, cfg_listelt_t *e; zn = cfg_obj_asstring(cfg_tuple_get(zconf, "name")); - result = dns_name_fromstring(myname, zn, 0, NULL); + result = dns_name_fromstring(myname, zn, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS || !dns_name_equal(zname, myname)) { continue; } @@ -14193,7 +14199,8 @@ find_name_in_list_from_map(const cfg_obj_t *config, if (strcmp(map_key_for_list, "zone") == 0) { name1 = dns_fixedname_initname(&fixed1); name2 = dns_fixedname_initname(&fixed2); - result = dns_name_fromstring(name1, name, 0, NULL); + result = dns_name_fromstring(name1, name, dns_rootname, 0, + NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); } @@ -14212,7 +14219,8 @@ find_name_in_list_from_map(const cfg_obj_t *config, } if (name1 != NULL) { - result = dns_name_fromstring(name2, vname, 0, NULL); + result = dns_name_fromstring(name2, vname, dns_rootname, + 0, NULL); if (result == ISC_R_SUCCESS && dns_name_equal(name1, name2)) { diff --git a/bin/tests/system/dyndb/driver/instance.c b/bin/tests/system/dyndb/driver/instance.c index af09f3551b..9fa597961c 100644 --- a/bin/tests/system/dyndb/driver/instance.c +++ b/bin/tests/system/dyndb/driver/instance.c @@ -81,14 +81,14 @@ parse_params(isc_mem_t *mctx, int argc, char **argv, dns_name_t *z1, result = ISC_R_FAILURE; goto cleanup; } - result = dns_name_fromstring2(z1, argv[0], dns_rootname, 0, mctx); + result = dns_name_fromstring(z1, argv[0], dns_rootname, 0, mctx); if (result != ISC_R_SUCCESS) { log_write(ISC_LOG_ERROR, "parse_params: dns_name_fromstring2 -> %s", isc_result_totext(result)); goto cleanup; } - result = dns_name_fromstring2(z2, argv[1], dns_rootname, 0, mctx); + result = dns_name_fromstring(z2, argv[1], dns_rootname, 0, mctx); if (result != ISC_R_SUCCESS) { log_write(ISC_LOG_ERROR, "parse_params: dns_name_fromstring2 -> %s", diff --git a/bin/tests/system/makejournal.c b/bin/tests/system/makejournal.c index 03be86e14a..9bed375a87 100644 --- a/bin/tests/system/makejournal.c +++ b/bin/tests/system/makejournal.c @@ -62,7 +62,7 @@ loadzone(dns_db_t **db, const char *origin, const char *filename) { name = dns_fixedname_initname(&fixed); - result = dns_name_fromstring(name, origin, 0, NULL); + result = dns_name_fromstring(name, origin, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { return (result); } diff --git a/bin/tools/named-rrchecker.c b/bin/tools/named-rrchecker.c index d31ebf79e3..b20a7e7d28 100644 --- a/bin/tools/named-rrchecker.c +++ b/bin/tools/named-rrchecker.c @@ -185,7 +185,8 @@ main(int argc, char *argv[]) { if (origin != NULL) { name = dns_fixedname_initname(&fixed); - result = dns_name_fromstring(name, origin, 0, NULL); + result = dns_name_fromstring(name, origin, dns_rootname, 0, + NULL); if (result != ISC_R_SUCCESS) { fatal("dns_name_fromstring: %s", isc_result_totext(result)); diff --git a/fuzz/dns_message_checksig.c b/fuzz/dns_message_checksig.c index a253fa7027..9129f540e6 100644 --- a/fuzz/dns_message_checksig.c +++ b/fuzz/dns_message_checksig.c @@ -193,7 +193,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { dns_tsigkeyring_create(mctx, &ring); dns_tsigkeyring_create(mctx, &emptyring); - result = dns_name_fromstring(name, "tsig-key", 0, NULL); + result = dns_name_fromstring(name, "tsig-key", dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_name_fromstring failed: %s\n", isc_result_totext(result)); @@ -214,7 +214,7 @@ LLVMFuzzerInitialize(int *argc ISC_ATTR_UNUSED, char ***argv ISC_ATTR_UNUSED) { return (1); } - result = dns_name_fromstring(name, "sig0key", 0, NULL); + result = dns_name_fromstring(name, "sig0key", dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { fprintf(stderr, "dns_name_fromstring failed: %s\n", isc_result_totext(result)); diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 63fcc3dd0e..d75f688433 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -1439,7 +1439,8 @@ catz_process_primaries(dns_catz_zone_t *catz, dns_ipkeylist_t *ipkl, memmove(keycbuf, rdatastr.data, rdatastr.length); keycbuf[rdatastr.length] = 0; dns_rdata_freestruct(&rdata_txt); - result = dns_name_fromstring(keyname, keycbuf, 0, mctx); + result = dns_name_fromstring(keyname, keycbuf, + dns_rootname, 0, mctx); if (result != ISC_R_SUCCESS) { dns_name_free(keyname, mctx); isc_mem_put(mctx, keyname, sizeof(*keyname)); @@ -2293,7 +2294,7 @@ dns__catz_update_cb(void *data) { * records might be processed differently depending on the version of * the catalog zone's schema. */ - result = dns_name_fromstring2(name, "version", &updb->origin, 0, NULL); + result = dns_name_fromstring(name, "version", &updb->origin, 0, NULL); if (result != ISC_R_SUCCESS) { dns_dbiterator_destroy(&updbit); isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index 3ff8011f34..631acd1bfa 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -431,7 +431,8 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, dns_name_t *machine; machine = dns_fixedname_initname(&fixed); - result = dns_name_fromstring(machine, sname, 0, NULL); + result = dns_name_fromstring(machine, sname, dns_rootname, 0, + NULL); if (result != ISC_R_SUCCESS) { return (false); } @@ -511,7 +512,7 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, dns_name_t *machine; machine = dns_fixedname_initname(&fixed); - result = dns_name_fromstring2(machine, sbuf, realm, 0, NULL); + result = dns_name_fromstring(machine, sbuf, realm, 0, NULL); if (result != ISC_R_SUCCESS) { return (false); } diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 51568b54bb..e02eca3b68 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -1160,12 +1160,9 @@ dns_name_tostring(const dns_name_t *source, char **target, isc_mem_t *mctx); */ isc_result_t -dns_name_fromstring(dns_name_t *target, const char *src, unsigned int options, +dns_name_fromstring(dns_name_t *target, const char *src, + const dns_name_t *origin, unsigned int options, isc_mem_t *mctx); -isc_result_t -dns_name_fromstring2(dns_name_t *target, const char *src, - const dns_name_t *origin, unsigned int options, - isc_mem_t *mctx); /*%< * Convert a string to a name and place it in target, allocating memory * as necessary. 'options' has the same semantics as that of diff --git a/lib/dns/name.c b/lib/dns/name.c index fb68632311..fa1dda64d8 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -2104,20 +2104,10 @@ dns_name_tostring(const dns_name_t *name, char **target, isc_mem_t *mctx) { return (ISC_R_SUCCESS); } -/* - * dns_name_fromstring() -- convert directly from a string to a name, - * allocating memory as needed - */ isc_result_t -dns_name_fromstring(dns_name_t *target, const char *src, unsigned int options, +dns_name_fromstring(dns_name_t *target, const char *src, + const dns_name_t *origin, unsigned int options, isc_mem_t *mctx) { - return (dns_name_fromstring2(target, src, dns_rootname, options, mctx)); -} - -isc_result_t -dns_name_fromstring2(dns_name_t *target, const char *src, - const dns_name_t *origin, unsigned int options, - isc_mem_t *mctx) { isc_result_t result; isc_buffer_t buf; dns_fixedname_t fn; diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c index 2ebfc1db5b..46da0d0326 100644 --- a/lib/dns/rdata/in_1/srv_33.c +++ b/lib/dns/rdata/in_1/srv_33.c @@ -335,8 +335,8 @@ additionaldata_in_srv(ARGS_ADDLDATA) { dns_fixedname_init(&fixed); snprintf(buf, sizeof(buf), "_%u._tcp", port); - result = dns_name_fromstring2(dns_fixedname_name(&fixed), buf, NULL, 0, - NULL); + result = dns_name_fromstring(dns_fixedname_name(&fixed), buf, NULL, 0, + NULL); if (result != ISC_R_SUCCESS) { return (ISC_R_SUCCESS); } diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c index 2098030283..c55d9fa241 100644 --- a/lib/isccfg/check.c +++ b/lib/isccfg/check.c @@ -278,7 +278,8 @@ validate_tls(const cfg_obj_t *config, const cfg_obj_t *obj, isc_log_t *logctx, const char *str) { dns_fixedname_t fname; dns_name_t *nm = dns_fixedname_initname(&fname); - isc_result_t result = dns_name_fromstring(nm, str, 0, NULL); + isc_result_t result = dns_name_fromstring(nm, str, dns_rootname, 0, + NULL); if (result != ISC_R_SUCCESS) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, @@ -975,7 +976,8 @@ check_name(const char *str) { dns_fixedname_t fixed; dns_fixedname_init(&fixed); - return (dns_name_fromstring(dns_fixedname_name(&fixed), str, 0, NULL)); + return (dns_name_fromstring(dns_fixedname_name(&fixed), str, + dns_rootname, 0, NULL)); } static bool @@ -2344,7 +2346,8 @@ resume: const char *str = cfg_obj_asstring(key); dns_fixedname_t fname; dns_name_t *nm = dns_fixedname_initname(&fname); - tresult = dns_name_fromstring(nm, str, 0, NULL); + tresult = dns_name_fromstring( + nm, str, dns_rootname, 0, NULL); if (tresult != ISC_R_SUCCESS) { cfg_obj_log(key, logctx, ISC_LOG_ERROR, "'%s' is not a valid name", @@ -2358,7 +2361,8 @@ resume: const char *str = cfg_obj_asstring(tls); dns_fixedname_t fname; dns_name_t *nm = dns_fixedname_initname(&fname); - tresult = dns_name_fromstring(nm, str, 0, NULL); + tresult = dns_name_fromstring( + nm, str, dns_rootname, 0, NULL); if (tresult != ISC_R_SUCCESS) { cfg_obj_log(tls, logctx, ISC_LOG_ERROR, "'%s' is not a valid name", @@ -2491,7 +2495,7 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) { } str = cfg_obj_asstring(identity); - tresult = dns_name_fromstring(id, str, 1, NULL); + tresult = dns_name_fromstring(id, str, dns_rootname, 1, NULL); if (tresult != ISC_R_SUCCESS) { cfg_obj_log(identity, logctx, ISC_LOG_ERROR, "'%s' is not a valid name", str); @@ -2509,7 +2513,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) { str = cfg_obj_asstring(dname); } if (tresult == ISC_R_SUCCESS) { - tresult = dns_name_fromstring(name, str, 0, NULL); + tresult = dns_name_fromstring(name, str, dns_rootname, + 0, NULL); if (tresult != ISC_R_SUCCESS) { cfg_obj_log(dname, logctx, ISC_LOG_ERROR, "'%s' is not a valid name", str); @@ -4492,7 +4497,7 @@ record_static_keys(isc_symtab_t *symtab, isc_mem_t *mctx, const char *str = cfg_obj_asstring(cfg_tuple_get(obj, "name")); isc_symvalue_t symvalue; - result = dns_name_fromstring(name, str, 0, NULL); + result = dns_name_fromstring(name, str, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { continue; } @@ -4565,7 +4570,7 @@ check_initializing_keys(isc_symtab_t *symtab, const cfg_obj_t *keylist, } str = cfg_obj_asstring(cfg_tuple_get(obj, "name")); - result = dns_name_fromstring(name, str, 0, NULL); + result = dns_name_fromstring(name, str, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { continue; } @@ -4613,7 +4618,7 @@ record_ds_keys(isc_symtab_t *symtab, isc_mem_t *mctx, const char *str = cfg_obj_asstring(cfg_tuple_get(obj, "name")); isc_symvalue_t symvalue; - result = dns_name_fromstring(name, str, 0, NULL); + result = dns_name_fromstring(name, str, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { continue; } @@ -4805,7 +4810,8 @@ check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj, } } - tresult = dns_name_fromstring(name, zonename, 0, NULL); + tresult = dns_name_fromstring(name, zonename, dns_rootname, 0, + NULL); if (tresult != ISC_R_SUCCESS) { cfg_obj_log(nameobj, logctx, ISC_LOG_ERROR, "bad domain name '%s'", zonename); @@ -4864,7 +4870,8 @@ check_rpz(const cfg_obj_t *rpz_obj, isc_log_t *logctx) { nameobj = cfg_tuple_get(obj, "zone name"); zonename = cfg_obj_asstring(nameobj); - tresult = dns_name_fromstring(name, zonename, 0, NULL); + tresult = dns_name_fromstring(name, zonename, dns_rootname, 0, + NULL); if (tresult != ISC_R_SUCCESS) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "bad domain name '%s'", zonename); @@ -4922,7 +4929,8 @@ check_catz(const cfg_obj_t *catz_obj, const char *viewname, isc_mem_t *mctx, nameobj = cfg_tuple_get(obj, "zone name"); zonename = cfg_obj_asstring(nameobj); - tresult = dns_name_fromstring(name, zonename, 0, NULL); + tresult = dns_name_fromstring(name, zonename, dns_rootname, 0, + NULL); if (tresult != ISC_R_SUCCESS) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "bad domain name '%s'", zonename); diff --git a/tests/dns/badcache_test.c b/tests/dns/badcache_test.c index dfe8adf6df..f7151b73fd 100644 --- a/tests/dns/badcache_test.c +++ b/tests/dns/badcache_test.c @@ -67,7 +67,7 @@ ISC_LOOP_TEST_IMPL(basic) { isc_result_t result; uint32_t flags = BADCACHE_TEST_FLAG; - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); bc = dns_badcache_new(mctx); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now + 60); @@ -95,7 +95,7 @@ ISC_LOOP_TEST_IMPL(expire) { isc_result_t result; uint32_t flags = BADCACHE_TEST_FLAG; - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); bc = dns_badcache_new(mctx); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now + 60); @@ -138,7 +138,7 @@ ISC_LOOP_TEST_IMPL(print) { uint8_t buf[4096]; size_t len; - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); bc = dns_badcache_new(mctx); dns_badcache_add(bc, name, dns_rdatatype_a, false, flags, expire); @@ -169,7 +169,7 @@ ISC_LOOP_TEST_IMPL(flush) { isc_result_t result; uint32_t flags = BADCACHE_TEST_FLAG; - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); bc = dns_badcache_new(mctx); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now + 60); @@ -197,22 +197,22 @@ ISC_LOOP_TEST_IMPL(flushname) { bc = dns_badcache_new(mctx); - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now + 60); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_SUCCESS); - dns_name_fromstring2(name, "sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.example.com.", NULL, 0, NULL); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now + 60); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_SUCCESS); - dns_name_fromstring2(name, "sub.sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.sub.example.com.", NULL, 0, NULL); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now + 60); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_SUCCESS); - dns_name_fromstring2(name, "sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.example.com.", NULL, 0, NULL); dns_badcache_flushname(bc, name); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); @@ -220,11 +220,11 @@ ISC_LOOP_TEST_IMPL(flushname) { result = dns_badcache_find(bc, name, dns_rdatatype_a, &flags, now); assert_int_equal(result, ISC_R_NOTFOUND); - dns_name_fromstring2(name, "sub.sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.sub.example.com.", NULL, 0, NULL); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_SUCCESS); - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_SUCCESS); @@ -243,36 +243,36 @@ ISC_LOOP_TEST_IMPL(flushtree) { bc = dns_badcache_new(mctx); - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now + 60); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_SUCCESS); assert_int_equal(flags, BADCACHE_TEST_FLAG); - dns_name_fromstring2(name, "sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.example.com.", NULL, 0, NULL); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now + 60); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_SUCCESS); assert_int_equal(flags, BADCACHE_TEST_FLAG); - dns_name_fromstring2(name, "sub.sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.sub.example.com.", NULL, 0, NULL); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now + 60); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_SUCCESS); assert_int_equal(flags, BADCACHE_TEST_FLAG); - dns_name_fromstring2(name, "sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.example.com.", NULL, 0, NULL); dns_badcache_flushtree(bc, name); - dns_name_fromstring2(name, "sub.sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.sub.example.com.", NULL, 0, NULL); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_NOTFOUND); - dns_name_fromstring2(name, "sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.example.com.", NULL, 0, NULL); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_NOTFOUND); - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now); assert_int_equal(result, ISC_R_SUCCESS); assert_int_equal(flags, BADCACHE_TEST_FLAG); @@ -292,19 +292,19 @@ ISC_LOOP_TEST_IMPL(purge) { bc = dns_badcache_new(mctx); - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now - 60); assert_int_equal(result, ISC_R_SUCCESS); - dns_name_fromstring2(name, "sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.example.com.", NULL, 0, NULL); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now - 60); assert_int_equal(result, ISC_R_SUCCESS); - dns_name_fromstring2(name, "sub.sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.sub.example.com.", NULL, 0, NULL); dns_badcache_add(bc, name, dns_rdatatype_aaaa, false, flags, now); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now - 60); @@ -314,17 +314,17 @@ ISC_LOOP_TEST_IMPL(purge) { now + 30); assert_int_equal(result, ISC_R_NOTFOUND); - dns_name_fromstring2(name, "sub.sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.sub.example.com.", NULL, 0, NULL); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now + 30); assert_int_equal(result, ISC_R_NOTFOUND); - dns_name_fromstring2(name, "sub.example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "sub.example.com.", NULL, 0, NULL); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now + 30); assert_int_equal(result, ISC_R_NOTFOUND); - dns_name_fromstring2(name, "example.com.", NULL, 0, NULL); + dns_name_fromstring(name, "example.com.", NULL, 0, NULL); result = dns_badcache_find(bc, name, dns_rdatatype_aaaa, &flags, now + 30); assert_int_equal(result, ISC_R_NOTFOUND); diff --git a/tests/dns/db_test.c b/tests/dns/db_test.c index 7a6e436230..ffcd65d275 100644 --- a/tests/dns/db_test.c +++ b/tests/dns/db_test.c @@ -114,7 +114,7 @@ ISC_RUN_TEST_IMPL(dns_dbfind_staleok) { example = dns_fixedname_initname(&example_fixed); found = dns_fixedname_initname(&found_fixed); - result = dns_name_fromstring(example, "example", 0, NULL); + result = dns_name_fromstring(example, "example", dns_rootname, 0, NULL); assert_int_equal(result, ISC_R_SUCCESS); /* diff --git a/tests/dns/name_test.c b/tests/dns/name_test.c index f5b517bc0d..bb4d2679ce 100644 --- a/tests/dns/name_test.c +++ b/tests/dns/name_test.c @@ -93,15 +93,15 @@ ISC_RUN_TEST_IMPL(fullcompare) { if (data[i].name1[0] == 0) { dns_fixedname_init(&fixed1); } else { - result = dns_name_fromstring2(name1, data[i].name1, - NULL, 0, NULL); + result = dns_name_fromstring(name1, data[i].name1, NULL, + 0, NULL); assert_int_equal(result, ISC_R_SUCCESS); } if (data[i].name2[0] == 0) { dns_fixedname_init(&fixed2); } else { - result = dns_name_fromstring2(name2, data[i].name2, - NULL, 0, NULL); + result = dns_name_fromstring(name2, data[i].name2, NULL, + 0, NULL); assert_int_equal(result, ISC_R_SUCCESS); } relation = dns_name_fullcompare(name1, name1, &order, &nlabels); @@ -493,7 +493,8 @@ ISC_RUN_TEST_IMPL(istat) { name = dns_fixedname_initname(&fixed); for (i = 0; i < (sizeof(data) / sizeof(data[0])); i++) { - result = dns_name_fromstring(name, data[i].name, 0, NULL); + result = dns_name_fromstring(name, data[i].name, dns_rootname, + 0, NULL); assert_int_equal(result, ISC_R_SUCCESS); assert_int_equal(dns_name_istat(name), data[i].istat); } @@ -621,11 +622,11 @@ ISC_RUN_TEST_IMPL(hash) { n1 = dns_fixedname_initname(&f1); n2 = dns_fixedname_initname(&f2); - result = dns_name_fromstring2(n1, testcases[i].name1, NULL, 0, - NULL); + result = dns_name_fromstring(n1, testcases[i].name1, NULL, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); - result = dns_name_fromstring2(n2, testcases[i].name2, NULL, 0, - NULL); + result = dns_name_fromstring(n2, testcases[i].name2, NULL, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); /* Check case-insensitive hashing first */ @@ -680,11 +681,11 @@ ISC_RUN_TEST_IMPL(issubdomain) { n1 = dns_fixedname_initname(&f1); n2 = dns_fixedname_initname(&f2); - result = dns_name_fromstring2(n1, testcases[i].name1, NULL, 0, - NULL); + result = dns_name_fromstring(n1, testcases[i].name1, NULL, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); - result = dns_name_fromstring2(n2, testcases[i].name2, NULL, 0, - NULL); + result = dns_name_fromstring(n2, testcases[i].name2, NULL, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); if (verbose) { @@ -730,8 +731,8 @@ ISC_RUN_TEST_IMPL(countlabels) { name = dns_fixedname_initname(&fname); - result = dns_name_fromstring2(name, testcases[i].namestr, NULL, - 0, NULL); + result = dns_name_fromstring(name, testcases[i].namestr, NULL, + 0, NULL); assert_int_equal(result, ISC_R_SUCCESS); if (verbose) { @@ -771,11 +772,11 @@ ISC_RUN_TEST_IMPL(getlabel) { n1 = dns_fixedname_initname(&f1); n2 = dns_fixedname_initname(&f2); - result = dns_name_fromstring2(n1, testcases[i].name1, NULL, 0, - NULL); + result = dns_name_fromstring(n1, testcases[i].name1, NULL, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); - result = dns_name_fromstring2(n2, testcases[i].name2, NULL, 0, - NULL); + result = dns_name_fromstring(n2, testcases[i].name2, NULL, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); dns_name_getlabel(n1, testcases[i].pos1, &l1); @@ -819,11 +820,11 @@ ISC_RUN_TEST_IMPL(getlabelsequence) { n1 = dns_fixedname_initname(&f1); n2 = dns_fixedname_initname(&f2); - result = dns_name_fromstring2(n1, testcases[i].name1, NULL, 0, - NULL); + result = dns_name_fromstring(n1, testcases[i].name1, NULL, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); - result = dns_name_fromstring2(n2, testcases[i].name2, NULL, 0, - NULL); + result = dns_name_fromstring(n2, testcases[i].name2, NULL, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); dns_name_getlabelsequence(n1, testcases[i].pos1, @@ -849,11 +850,12 @@ ISC_RUN_TEST_IMPL(maxlabels) { "a.b.c."; name = dns_fixedname_initname(&fixed); - result = dns_name_fromstring(name, one_too_many, 0, NULL); + result = dns_name_fromstring(name, one_too_many, dns_rootname, 0, NULL); assert_int_equal(result, ISC_R_NOSPACE); name = dns_fixedname_initname(&fixed); - result = dns_name_fromstring(name, one_too_many + 2, 0, NULL); + result = dns_name_fromstring(name, one_too_many + 2, dns_rootname, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); assert_true(dns_name_isvalid(name)); assert_int_equal(dns_name_countlabels(name), DNS_NAME_MAXLABELS); diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c index d960b529f3..befe57986c 100644 --- a/tests/dns/rdata_test.c +++ b/tests/dns/rdata_test.c @@ -224,17 +224,19 @@ rdata_checknames(dns_rdata_t *rdata) { (void)dns_rdata_checknames(rdata, dns_rootname, NULL); (void)dns_rdata_checknames(rdata, dns_rootname, bad); - result = dns_name_fromstring(name, "example.net", 0, NULL); + result = dns_name_fromstring(name, "example.net", dns_rootname, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); (void)dns_rdata_checknames(rdata, name, NULL); (void)dns_rdata_checknames(rdata, name, bad); - result = dns_name_fromstring(name, "in-addr.arpa", 0, NULL); + result = dns_name_fromstring(name, "in-addr.arpa", dns_rootname, 0, + NULL); assert_int_equal(result, ISC_R_SUCCESS); (void)dns_rdata_checknames(rdata, name, NULL); (void)dns_rdata_checknames(rdata, name, bad); - result = dns_name_fromstring(name, "ip6.arpa", 0, NULL); + result = dns_name_fromstring(name, "ip6.arpa", dns_rootname, 0, NULL); assert_int_equal(result, ISC_R_SUCCESS); (void)dns_rdata_checknames(rdata, name, NULL); (void)dns_rdata_checknames(rdata, name, bad); diff --git a/tests/dns/sigs_test.c b/tests/dns/sigs_test.c index d521757d87..94d94fbb39 100644 --- a/tests/dns/sigs_test.c +++ b/tests/dns/sigs_test.c @@ -129,7 +129,8 @@ compare_tuples(const zonediff_t *expected, dns_difftuple_t *found, * Check owner name. */ expected_name = dns_fixedname_initname(&expected_fname); - result = dns_name_fromstring(expected_name, expected->owner, 0, mctx); + result = dns_name_fromstring(expected_name, expected->owner, + dns_rootname, 0, mctx); assert_int_equal(result, ISC_R_SUCCESS); dns_name_format(&found->name, found_name, sizeof(found_name)); assert_true(dns_name_equal(expected_name, &found->name)); diff --git a/tests/dns/tsig_test.c b/tests/dns/tsig_test.c index 6c6935e7c9..bab3156da7 100644 --- a/tests/dns/tsig_test.c +++ b/tests/dns/tsig_test.c @@ -287,7 +287,7 @@ ISC_RUN_TEST_IMPL(tsig_tcp) { /* isc_log_setdebuglevel(lctx, 99); */ keyname = dns_fixedname_initname(&fkeyname); - result = dns_name_fromstring(keyname, "test", 0, NULL); + result = dns_name_fromstring(keyname, "test", dns_rootname, 0, NULL); assert_int_equal(result, ISC_R_SUCCESS); dns_tsigkeyring_create(mctx, &ring); diff --git a/tests/libtest/dns.c b/tests/libtest/dns.c index de0545be8b..d50c012caf 100644 --- a/tests/libtest/dns.c +++ b/tests/libtest/dns.c @@ -127,7 +127,7 @@ dns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view, */ dns_zone_settype(zone, dns_zone_primary); origin = dns_fixedname_initname(&fixed_origin); - result = dns_name_fromstring(origin, name, 0, NULL); + result = dns_name_fromstring(origin, name, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { goto detach_zone; } @@ -219,7 +219,7 @@ dns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, name = dns_fixedname_initname(&fixed); - result = dns_name_fromstring(name, origin, 0, NULL); + result = dns_name_fromstring(name, origin, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { return (result); } @@ -455,7 +455,8 @@ dns_test_difffromchanges(dns_diff_t *diff, const zonechange_t *changes, * Parse owner name. */ name = dns_fixedname_initname(&fixedname); - result = dns_name_fromstring(name, changes[i].owner, 0, mctx); + result = dns_name_fromstring(name, changes[i].owner, + dns_rootname, 0, mctx); if (result != ISC_R_SUCCESS) { break; } diff --git a/tests/libtest/ns.c b/tests/libtest/ns.c index 8f7f130253..19b2f67699 100644 --- a/tests/libtest/ns.c +++ b/tests/libtest/ns.c @@ -285,7 +285,7 @@ attach_query_msg_to_client(ns_client_t *client, const char *qnamestr, * class IN and type "qtype", link the two and add the result to the * QUESTION section of the query. */ - result = dns_name_fromstring(qname, qnamestr, 0, mctx); + result = dns_name_fromstring(qname, qnamestr, dns_rootname, 0, mctx); if (result != ISC_R_SUCCESS) { goto put_name; } @@ -533,7 +533,7 @@ ns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, name = dns_fixedname_initname(&fixed); - result = dns_name_fromstring(name, origin, 0, NULL); + result = dns_name_fromstring(name, origin, dns_rootname, 0, NULL); if (result != ISC_R_SUCCESS) { return (result); }