rename dns_name_copynf() to dns_name_copy()

dns_name_copy() is now the standard name-copying function.

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 754bbbb5a5151c5cd38c8ff28f10714f966cdb7d..fd0c7455f40784f84448af70410cd3d87122a991 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -797,8 +797,8 @@ clone_lookup(dig_lookup_t *lookold, bool servers) {
                memmove(looknew->ecs_addr, lookold->ecs_addr, len);
        }
 
-       dns_name_copynf(dns_fixedname_name(&lookold->fdomain),
-                       dns_fixedname_name(&looknew->fdomain));
+       dns_name_copy(dns_fixedname_name(&lookold->fdomain),
+                     dns_fixedname_name(&looknew->fdomain));
 
        if (servers) {
                clone_server_list(lookold->my_server_list,
@@ -1890,7 +1890,7 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) {
                                        lookup->recurse = false;
                                }
                                domain = dns_fixedname_name(&lookup->fdomain);
-                               dns_name_copynf(name, domain);
+                               dns_name_copy(name, domain);
                        }
                        debug("adding server %s", namestr);
                        num = getaddresses(lookup, namestr, &lresult);
@@ -2244,7 +2244,7 @@ setup_lookup(dig_lookup_t *lookup) {
                                                name, lookup->oname,
                                                lookup->name, &lookup->namebuf);
                                } else {
-                                       dns_name_copynf(name, lookup->name);
+                                       dns_name_copy(name, lookup->name);
                                }
                        }
                        if (result != ISC_R_SUCCESS) {

diff --git a/bin/dig/host.c b/bin/dig/host.c
index b3ddc52f1a68deb3e381506284bf60dedea75519..ba0bbe63d0bec74487ab28d74e937ed5ea522edc 100644 (file)
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -379,7 +379,7 @@ chase_cnamechain(dns_message_t *msg, dns_name_t *qname) {
                dns_rdataset_current(rdataset, &rdata);
                result = dns_rdata_tostruct(&rdata, &cname, NULL);
                check_result(result, "dns_rdata_tostruct");
-               dns_name_copynf(&cname.cname, qname);
+               dns_name_copy(&cname.cname, qname);
                dns_rdata_freestruct(&cname);
        }
 }
@@ -442,7 +442,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg,
 
                /* Add AAAA and MX lookups. */
                name = dns_fixedname_initname(&fixed);
-               dns_name_copynf(query->lookup->name, name);
+               dns_name_copy(query->lookup->name, name);
                chase_cnamechain(msg, name);
                dns_name_format(name, namestr, sizeof(namestr));
                lookup = clone_lookup(query->lookup, false);

diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index ad5e970d2dce7b12d7105c5e1ba7551c4c438df2..702e9af41d3506efc8fb00a6900f6a691b88aaeb 100644 (file)
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -391,7 +391,7 @@ chase_cnamechain(dns_message_t *msg, dns_name_t *qname) {
                dns_rdataset_current(rdataset, &rdata);
                result = dns_rdata_tostruct(&rdata, &cname, NULL);
                check_result(result, "dns_rdata_tostruct");
-               dns_name_copynf(&cname.cname, qname);
+               dns_name_copy(&cname.cname, qname);
                dns_rdata_freestruct(&cname);
        }
 }
@@ -448,7 +448,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg,
 
                /* Add AAAA lookup. */
                name = dns_fixedname_initname(&fixed);
-               dns_name_copynf(query->lookup->name, name);
+               dns_name_copy(query->lookup->name, name);
                chase_cnamechain(msg, name);
                dns_name_format(name, namestr, sizeof(namestr));
                lookup = clone_lookup(query->lookup, false);

diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
index a5e0bc82068d1e5fcf7eeed079c1b58a0be76735..618ab03cdc891f294dbdbafbf5458df9b6b19aaf 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.c
+++ b/bin/dnssec/dnssec-dsfromkey.c
@@ -215,7 +215,7 @@ loadkey(char *filename, unsigned char *key_buf, unsigned int key_buf_size,
        rdclass = dst_key_class(key);
 
        name = dns_fixedname_initname(&fixed);
-       dns_name_copynf(dst_key_name(key), name);
+       dns_name_copy(dst_key_name(key), name);
 
        dst_key_free(&key);
 }

diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c
index bc16f6c431423734890206fc003971ec3ab0c593..77ef407717bf34446c9050b3a3f5d537ff158b34 100644 (file)
--- a/bin/dnssec/dnssec-importkey.c
+++ b/bin/dnssec/dnssec-importkey.c
@@ -185,7 +185,7 @@ loadkey(char *filename, unsigned char *key_buf, unsigned int key_buf_size,
        rdclass = dst_key_class(key);
 
        name = dns_fixedname_initname(&fixed);
-       dns_name_copynf(dst_key_name(key), name);
+       dns_name_copy(dst_key_name(key), name);
 
        dst_key_free(&key);
 }

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index f19b692612ae369481f49760b39dbfb84edf9f3e..8d22d71d79c1a350d5312fc8014c23160e4c47ec 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -201,7 +201,7 @@ savezonecut(dns_fixedname_t *fzonecut, dns_name_t *name) {
        dns_name_t *result;
 
        result = dns_fixedname_initname(fzonecut);
-       dns_name_copynf(name, result);
+       dns_name_copy(name, result);
 
        return (result);
 }
@@ -2397,7 +2397,7 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations,
                        break;
                }
                if (result == ISC_R_NOMORE) {
-                       dns_name_copynf(gorigin, nextname);
+                       dns_name_copy(gorigin, nextname);
                        done = true;
                } else if (result != ISC_R_SUCCESS) {
                        fatal("iterating through the database failed: %s",
@@ -2534,7 +2534,7 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations,
                        break;
                }
                if (result == ISC_R_NOMORE) {
-                       dns_name_copynf(gorigin, nextname);
+                       dns_name_copy(gorigin, nextname);
                        done = true;
                } else if (result != ISC_R_SUCCESS) {
                        fatal("iterating through the database failed: %s",

diff --git a/bin/named/server.c b/bin/named/server.c
index 4be656b1f167c38bf1516390d97698f1d99edf3c..9bcf3aa3062203d14bbc8cc13eef29e6389738e3 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -7330,7 +7330,7 @@ dotat(dns_keytable_t *keytable, dns_keynode_t *keynode, dns_name_t *keyname,
        tat->view = NULL;
        dns_rdataset_init(&tat->rdataset);
        dns_rdataset_init(&tat->sigrdataset);
-       dns_name_copynf(keyname, dns_fixedname_initname(&tat->keyname));
+       dns_name_copy(keyname, dns_fixedname_initname(&tat->keyname));
        result = get_tat_qname(dns_fixedname_initname(&tat->tatname), keyname,
                               keynode);
        if (result != ISC_R_SUCCESS) {

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index c82cf76850e0caaca7066fa9d5f1b0a415659755..2e05cee6d4d4c689d90553b34499e4a5829852d8 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -272,8 +272,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
 
                dns_fixedname_init(&fname);
                if (usezone) {
-                       dns_name_copynf(dns_zone_getorigin(zone),
-                                       dns_fixedname_name(&fname));
+                       dns_name_copy(dns_zone_getorigin(zone),
+                                     dns_fixedname_name(&fname));
                } else {
                        str = cfg_obj_asstring(dname);
                        isc_buffer_constinit(&b, str, strlen(str));

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 95255e03331975a01fc6f24871a8e4e5c94d834d..9835c47b9e5c1887c9022161e6cd880a8288205d 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -2730,7 +2730,7 @@ lookforsoa:
                 * address.
                 */
                zname = dns_fixedname_initname(&fzname);
-               dns_name_copynf(name, zname);
+               dns_name_copy(name, zname);
        }
 
        if (debugging) {

diff --git a/bin/tests/system/dyndb/driver/syncptr.c b/bin/tests/system/dyndb/driver/syncptr.c
index c142063a44abb36a3f1a369eb1537dda38c15c8f..3212a2d93fbff10499d7fcaae16b58861e627ce0 100644 (file)
--- a/bin/tests/system/dyndb/driver/syncptr.c
+++ b/bin/tests/system/dyndb/driver/syncptr.c
@@ -229,7 +229,7 @@ syncptr(sample_instance_t *inst, dns_name_t *name, dns_rdata_t *addr_rdata,
        /* Reverse zone is managed by this driver, prepare PTR record */
        pevent->zone = NULL;
        dns_zone_attach(ptr_zone, &pevent->zone);
-       dns_name_copynf(name, dns_fixedname_name(&pevent->ptr_target_name));
+       dns_name_copy(name, dns_fixedname_name(&pevent->ptr_target_name));
        dns_name_clone(dns_fixedname_name(&pevent->ptr_target_name),
                       &ptr_struct.ptr);
        dns_diff_init(inst->mctx, &pevent->diff);

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index fbe347d35088636620b26e0af498c1933f8afc92..37cd3dbdcdac21a11c42970649c69654f88926d4 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -3325,7 +3325,7 @@ post_copy:
        find->partial_result |= (adbname->partial_result & wanted_addresses);
        if (alias) {
                if (target != NULL) {
-                       dns_name_copynf(&adbname->target, target);
+                       dns_name_copy(&adbname->target, target);
                }
                result = DNS_R_ALIAS;
        } else {

diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c
index 86ba39c4c6e913aa85c8afe2cc7f3e3102930f4b..aa09779b9ef1b152aa54994fb65a91922993d874 100644 (file)
--- a/lib/dns/badcache.c
+++ b/lib/dns/badcache.c
@@ -265,7 +265,7 @@ dns_badcache_add(dns_badcache_t *bc, const dns_name_t *name,
 
                isc_buffer_init(&buffer, bad + 1, name->length);
                bad->name = dns_fixedname_initname(&bad->fname);
-               dns_name_copynf(name, bad->name);
+               dns_name_copy(name, bad->name);
                bc->table[hash] = bad;
 
                count = atomic_fetch_add_relaxed(&bc->count, 1);

diff --git a/lib/dns/client.c b/lib/dns/client.c
index bbf9031700b0913f2f3060053bc8353ba23410b1..f3eb236fb805abad5b1240474864361a35dea3c6 100644 (file)
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -735,7 +735,7 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) {
                        if (tresult != ISC_R_SUCCESS) {
                                goto done;
                        }
-                       dns_name_copynf(&cname.cname, name);
+                       dns_name_copy(&cname.cname, name);
                        dns_rdata_freestruct(&cname);
                        want_restart = true;
                        goto done;
@@ -1155,7 +1155,7 @@ dns_client_startresolve(dns_client_t *client, const dns_name_t *name,
        rctx->sigrdataset = sigrdataset;
 
        dns_fixedname_init(&rctx->name);
-       dns_name_copynf(name, dns_fixedname_name(&rctx->name));
+       dns_name_copy(name, dns_fixedname_name(&rctx->name));
 
        rctx->client = client;
        ISC_LINK_INIT(rctx, link);

diff --git a/lib/dns/dnsrps.c b/lib/dns/dnsrps.c
index 0f2ffb5f353da90caf070543ae32d451c9c7001c..f12065664e2b2c3f3d8430462a954726bfd9abba 100644 (file)
--- a/lib/dns/dnsrps.c
+++ b/lib/dns/dnsrps.c
@@ -612,7 +612,7 @@ rpsdb_finddb(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
                nodep = &node;
        }
        rpsdb_findnode(db, name, false, nodep);
-       dns_name_copynf(name, foundname);
+       dns_name_copy(name, foundname);
        return (rpsdb_findrdataset(db, *nodep, NULL, type, 0, 0, rdataset,
                                   sigrdataset));
 }

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 48c10bfaddfa2d271b53d99a52c02b4fd89b3d7b..bc141e2cf275129ef0e0f846c00f1fa5eae6fdb7 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -1241,7 +1241,7 @@ dns_name_settotextfilter(dns_name_totextfilter_t *proc);
  */
 
 void
-dns_name_copynf(const dns_name_t *source, dns_name_t *dest);
+dns_name_copy(const dns_name_t *source, dns_name_t *dest);
 /*%<
  * Copies the name in 'source' into 'dest'.  The name data is copied to
  * the dedicated buffer for 'dest'. (If copying to a name that doesn't

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 878255e4be35d31df29acbe34b8391450bfac9e0..6981ae74c149717832298fdc307c20e9531bee2c 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -131,7 +131,7 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx,
        dns_name_t *zonename;
 
        zonename = dns_fixedname_initname(&fixed);
-       dns_name_copynf(dns_db_origin(db), zonename);
+       dns_name_copy(dns_db_origin(db), zonename);
 
        node = NULL;
        result = dns_db_findnode(db, zonename, false, &node);

diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c
index ce489aeffc3aca57999e21ce718744016ac846cc..d62aaee2f452939749a238999038d117d3656533 100644 (file)
--- a/lib/dns/lookup.c
+++ b/lib/dns/lookup.c
@@ -247,7 +247,7 @@ lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) {
                        if (result != ISC_R_SUCCESS) {
                                break;
                        }
-                       dns_name_copynf(&cname.cname, name);
+                       dns_name_copy(&cname.cname, name);
                        dns_rdata_freestruct(&cname);
                        want_restart = true;
                        send_event = false;
@@ -388,7 +388,7 @@ dns_lookup_create(isc_mem_t *mctx, const dns_name_t *name, dns_rdatatype_t type,
 
        dns_fixedname_init(&lookup->name);
 
-       dns_name_copynf(name, dns_fixedname_name(&lookup->name));
+       dns_name_copy(name, dns_fixedname_name(&lookup->name));
 
        lookup->type = type;
        lookup->view = NULL;

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index c8dcce5aa2c41d68da7903aacdd86c27e6a79545..75cd0d250988cbef32d0dd54d2c21c820ef0df97 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -572,7 +572,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 
        if (owner_name != NULL) {
                name = dns_fixedname_initname(&fixed);
-               dns_name_copynf(owner_name, name);
+               dns_name_copy(owner_name, name);
                dns_rdataset_getownercase(rdataset, name);
        }
 
@@ -1286,7 +1286,7 @@ dump_rdatasets_raw(isc_mem_t *mctx, const dns_name_t *owner_name,
        dns_name_t *name;
 
        name = dns_fixedname_initname(&fixed);
-       dns_name_copynf(owner_name, name);
+       dns_name_copy(owner_name, name);
        for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS;
             result = dns_rdatasetiter_next(rdsiter))
        {

diff --git a/lib/dns/name.c b/lib/dns/name.c
index e5715638d0eb68410175f1ec043fa24aa7f617fd..8400bcb20a13e79b88dc604add82384f404b91a6 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -2463,7 +2463,7 @@ dns_name_fromstring2(dns_name_t *target, const char *src,
 }
 
 void
-dns_name_copynf(const dns_name_t *source, dns_name_t *dest) {
+dns_name_copy(const dns_name_t *source, dns_name_t *dest) {
        isc_buffer_t *target = NULL;
        unsigned char *ndata = NULL;
 

diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c
index 7ff9e8df404c873d5151b70073fba21c3fd717a5..8a5c99a081d42e6ee1991c0404ec8822898abe29 100644 (file)
--- a/lib/dns/nsec3.c
+++ b/lib/dns/nsec3.c
@@ -1964,7 +1964,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name,
         */
        if (dns_name_countlabels(zonename) == 0 ||
            dns_name_issubdomain(zone, zonename)) {
-               dns_name_copynf(zone, zonename);
+               dns_name_copy(zone, zonename);
        }
 
        if (!dns_name_equal(zone, zonename)) {
@@ -2123,7 +2123,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name,
                                         "NSEC3 indicates potential closest "
                                         "encloser: '%s'",
                                         namebuf);
-                               dns_name_copynf(qname, closest);
+                               dns_name_copy(qname, closest);
                                *setclosest = true;
                        }
                        dns_name_format(qname, namebuf, sizeof(namebuf));
@@ -2157,7 +2157,7 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name,
                            (dns_name_countlabels(nearest) == 0 ||
                             dns_name_issubdomain(nearest, qname)))
                        {
-                               dns_name_copynf(qname, nearest);
+                               dns_name_copy(qname, nearest);
                                *setnearest = true;
                        }
 

diff --git a/lib/dns/nta.c b/lib/dns/nta.c
index bd0cbd093ee5d3a79f68701a526637e5c8997f8e..b4033b4aa9164e83d59db1e2934305c13d8871cf 100644 (file)
--- a/lib/dns/nta.c
+++ b/lib/dns/nta.c
@@ -317,7 +317,7 @@ nta_create(dns_ntatable_t *ntatable, const dns_name_t *name,
        isc_refcount_init(&nta->refcount, 1);
 
        nta->name = dns_fixedname_initname(&nta->fn);
-       dns_name_copynf(name, nta->name);
+       dns_name_copy(name, nta->name);
 
        nta->magic = NTA_MAGIC;
 

diff --git a/lib/dns/order.c b/lib/dns/order.c
index fbd1c9f6dad3ecec77eb71acf9e16714c999f406..972c21f3e65e09fff5908afa4151c7f48c7b77c8 100644 (file)
--- a/lib/dns/order.c
+++ b/lib/dns/order.c
@@ -79,7 +79,7 @@ dns_order_add(dns_order_t *order, const dns_name_t *name,
        ent = isc_mem_get(order->mctx, sizeof(*ent));
 
        dns_fixedname_init(&ent->name);
-       dns_name_copynf(name, dns_fixedname_name(&ent->name));
+       dns_name_copy(name, dns_fixedname_name(&ent->name));
        ent->rdtype = rdtype;
        ent->rdclass = rdclass;
        ent->mode = mode;

diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 9834baeb550a597bf99d3ca67fbba9aaa2322677..03ec0993cec64d1a35d8b019ba2e39705b42891a 100644 (file)
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -1100,7 +1100,7 @@ chain_name(dns_rbtnodechain_t *chain, dns_name_t *name,
 
        if (include_chain_end && chain->end != NULL) {
                NODENAME(chain->end, &nodename);
-               dns_name_copynf(&nodename, name);
+               dns_name_copy(&nodename, name);
        } else {
                dns_name_reset(name);
        }
@@ -3296,7 +3296,7 @@ dns_rbtnodechain_current(dns_rbtnodechain_t *chain, dns_name_t *name,
                if (chain->level_count > 0) {
                        result = chain_name(chain, origin, false);
                } else {
-                       dns_name_copynf(dns_rootname, origin);
+                       dns_name_copy(dns_rootname, origin);
                }
        }
 

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 4efa16beadcb314190c7615716e633225b2cca39..c16e811babdef6fd1e8160cee7828c23aa47f6f2 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -3059,7 +3059,7 @@ zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) {
                         * is, we need to remember the node name.
                         */
                        zcname = dns_fixedname_name(&search->zonecut_name);
-                       dns_name_copynf(name, zcname);
+                       dns_name_copy(name, zcname);
                        search->copy_name = true;
                }
        } else {
@@ -3229,7 +3229,7 @@ setup_delegation(rbtdb_search_t *search, dns_dbnode_t **nodep,
         */
        if (foundname != NULL && search->copy_name) {
                zcname = dns_fixedname_name(&search->zonecut_name);
-               dns_name_copynf(zcname, foundname);
+               dns_name_copy(zcname, foundname);
        }
        if (nodep != NULL) {
                /*
@@ -4079,7 +4079,7 @@ zone_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
                         */
                        result = find_wildcard(&search, &node, name);
                        if (result == ISC_R_SUCCESS) {
-                               dns_name_copynf(name, foundname);
+                               dns_name_copy(name, foundname);
                                wild = true;
                                goto found;
                        } else if (result != ISC_R_NOTFOUND) {
@@ -4799,7 +4799,7 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node,
                        if (foundname != NULL) {
                                dns_name_init(&name, NULL);
                                dns_rbt_namefromnode(node, &name);
-                               dns_name_copynf(&name, foundname);
+                               dns_name_copy(&name, foundname);
                                while (i > 0) {
                                        i--;
                                        level_node = search->chain.levels[i];
@@ -5368,7 +5368,7 @@ cache_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options,
        } else if (result != ISC_R_SUCCESS) {
                goto tree_exit;
        } else if (!dcnull) {
-               dns_name_copynf(dcname, foundname);
+               dns_name_copy(dcname, foundname);
        }
        /*
         * We now go looking for an NS rdataset at the node.
@@ -9832,7 +9832,7 @@ dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) {
                return (rbtdbiter->result);
        }
 
-       dns_name_copynf(origin, name);
+       dns_name_copy(origin, name);
        return (ISC_R_SUCCESS);
 }
 
@@ -10136,7 +10136,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
                glue = isc_mem_get(ctx->rbtdb->common.mctx, sizeof(*glue));
 
                gluename = dns_fixedname_initname(&glue->fixedname);
-               dns_name_copynf(name_a, gluename);
+               dns_name_copy(name_a, gluename);
 
                dns_rdataset_init(&glue->rdataset_a);
                dns_rdataset_init(&glue->sigrdataset_a);
@@ -10160,7 +10160,7 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) {
                                           sizeof(*glue));
 
                        gluename = dns_fixedname_initname(&glue->fixedname);
-                       dns_name_copynf(name_aaaa, gluename);
+                       dns_name_copy(name_aaaa, gluename);
 
                        dns_rdataset_init(&glue->rdataset_a);
                        dns_rdataset_init(&glue->sigrdataset_a);
@@ -10299,7 +10299,7 @@ restart:
                        goto no_glue;
                }
 
-               dns_name_copynf(gluename, name);
+               dns_name_copy(gluename, name);
 
                if (dns_rdataset_isassociated(&ge->rdataset_a)) {
                        result = dns_message_gettemprdataset(msg, &rdataset_a);

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index bf9e7af323d3e1d1f819420eb0e0bf867d96fe63..87fda079f9851d0973530488602b3305d6272948 100644 (file)
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -440,7 +440,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
        added = 0;
 
        name = dns_fixedname_initname(&fixed);
-       dns_name_copynf(owner_name, name);
+       dns_name_copy(owner_name, name);
        dns_rdataset_getownercase(rdataset, name);
        offset = 0xffff;
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 77db041903fa7cd134967ae7933cc3475bdd0f59..9840016f9ea94f83d926d8c37b59fdff6d8b8223 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1636,7 +1636,7 @@ fcount_incr(fetchctx_t *fctx, bool force) {
                        counter->dropped = 0;
                        counter->domain =
                                dns_fixedname_initname(&counter->fdname);
-                       dns_name_copynf(&fctx->domain, counter->domain);
+                       dns_name_copy(&fctx->domain, counter->domain);
                        ISC_LIST_APPEND(dbucket->list, counter, link);
                }
        } else {
@@ -5551,7 +5551,7 @@ clone_results(fetchctx_t *fctx) {
                        continue;
                }
                name = dns_fixedname_name(&event->foundname);
-               dns_name_copynf(hname, name);
+               dns_name_copy(hname, name);
                event->result = hevent->result;
                dns_db_attach(hevent->db, &event->db);
                dns_db_attachnode(hevent->db, hevent->node, &event->node);
@@ -5693,8 +5693,8 @@ validated(isc_task_t *task, isc_event_t *event) {
         */
        if (vevent->proofs[DNS_VALIDATOR_NOQNAMEPROOF] != NULL) {
                wild = dns_fixedname_initname(&fwild);
-               dns_name_copynf(dns_fixedname_name(&vevent->validator->wild),
-                               wild);
+               dns_name_copy(dns_fixedname_name(&vevent->validator->wild),
+                             wild);
        }
        dns_validator_destroy(&vevent->validator);
        dns_message_detach(&valarg->message);
@@ -6092,8 +6092,8 @@ answer_response:
                               eresult == DNS_R_NCACHENXRRSET);
                }
                hevent->result = eresult;
-               dns_name_copynf(vevent->name,
-                               dns_fixedname_name(&hevent->foundname));
+               dns_name_copy(vevent->name,
+                             dns_fixedname_name(&hevent->foundname));
                dns_db_attach(fctx->cache, &hevent->db);
                dns_db_transfernode(fctx->cache, &node, &hevent->node);
                clone_results(fctx);
@@ -6323,7 +6323,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_message_t *message,
                if (event != NULL) {
                        adbp = &event->db;
                        aname = dns_fixedname_name(&event->foundname);
-                       dns_name_copynf(name, aname);
+                       dns_name_copy(name, aname);
                        anodep = &event->node;
                        /*
                         * If this is an ANY, SIG or RRSIG query, we're not
@@ -6942,7 +6942,7 @@ ncache_message(fetchctx_t *fctx, dns_message_t *message,
                if (event != NULL) {
                        adbp = &event->db;
                        aname = dns_fixedname_name(&event->foundname);
-                       dns_name_copynf(name, aname);
+                       dns_name_copy(name, aname);
                        anodep = &event->node;
                        ardataset = event->rdataset;
                }
@@ -7473,7 +7473,7 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) {
                 * Retrieve state from fctx->nsfetch before we destroy it.
                 */
                domain = dns_fixedname_initname(&fixed);
-               dns_name_copynf(&fctx->nsfetch->private->domain, domain);
+               dns_name_copy(&fctx->nsfetch->private->domain, domain);
                if (dns_name_equal(&fctx->nsname, domain)) {
                        if (dns_rdataset_isassociated(fevent->rdataset)) {
                                dns_rdataset_disassociate(fevent->rdataset);

diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index 36fcad996bc79aab384f5bd587b643865bdb3f5a..0bde96a7c4d91357813e8175a7eee2c19d0eca06 100644 (file)
--- a/lib/dns/rrl.c
+++ b/lib/dns/rrl.c
@@ -933,8 +933,8 @@ make_log_buf(dns_rrl_t *rrl, dns_rrl_entry_t *e, const char *str1,
                                e->log_qname = qbuf->index;
                                qbuf->e = e;
                                dns_fixedname_init(&qbuf->qname);
-                               dns_name_copynf(qname, dns_fixedname_name(
-                                                              &qbuf->qname));
+                               dns_name_copy(qname,
+                                             dns_fixedname_name(&qbuf->qname));
                        }
                }
                if (qbuf != NULL) {

diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index d9de42240977603e9e2d7438fe9799df010a2c10..b22a8779ff97e822b39d6f7073635a05f45d64ed 100644 (file)
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -999,7 +999,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
        }
 
        if (foundname != NULL) {
-               dns_name_copynf(xname, foundname);
+               dns_name_copy(xname, foundname);
        }
 
        if (nodep != NULL) {
@@ -1542,7 +1542,7 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep,
 
        attachnode(iterator->db, sdbiter->current, nodep);
        if (name != NULL) {
-               dns_name_copynf(sdbiter->current->name, name);
+               dns_name_copy(sdbiter->current->name, name);
                return (ISC_R_SUCCESS);
        }
        return (ISC_R_SUCCESS);
@@ -1557,7 +1557,7 @@ dbiterator_pause(dns_dbiterator_t *iterator) {
 static isc_result_t
 dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) {
        UNUSED(iterator);
-       dns_name_copynf(dns_rootname, name);
+       dns_name_copy(dns_rootname, name);
        return (ISC_R_SUCCESS);
 }
 

diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index c8a615a0f3d6020e99607dd23c2af0f7fdc85ca0..4eb0a1aeeba26d190e46713170f6a2dda6c756fa 100644 (file)
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -993,7 +993,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
        }
 
        if (foundname != NULL) {
-               dns_name_copynf(xname, foundname);
+               dns_name_copy(xname, foundname);
        }
 
        if (nodep != NULL) {
@@ -1380,7 +1380,7 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep,
 
        attachnode(iterator->db, sdlziter->current, nodep);
        if (name != NULL) {
-               dns_name_copynf(sdlziter->current->name, name);
+               dns_name_copy(sdlziter->current->name, name);
                return (ISC_R_SUCCESS);
        }
        return (ISC_R_SUCCESS);
@@ -1395,7 +1395,7 @@ dbiterator_pause(dns_dbiterator_t *iterator) {
 static isc_result_t
 dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) {
        UNUSED(iterator);
-       dns_name_copynf(dns_rootname, name);
+       dns_name_copy(dns_rootname, name);
        return (ISC_R_SUCCESS);
 }
 

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 4267cbf1841fba5a1f04555143933367fdff30d3..f0489d483493a8832031f67ca848e35ec2049262 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -180,7 +180,7 @@ add_rdata_to_list(dns_message_t *msg, dns_name_t *name, dns_rdata_t *rdata,
        dns_message_takebuffer(msg, &tmprdatabuf);
 
        RETERR(dns_message_gettempname(msg, &newname));
-       dns_name_copynf(name, newname);
+       dns_name_copy(name, newname);
 
        RETERR(dns_message_gettemprdatalist(msg, &newlist));
        newlist->rdclass = newrdata->rdclass;
@@ -821,7 +821,7 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx,
 
                if (!dns_name_equal(qname, dns_rootname)) {
                        unsigned int n = dns_name_countlabels(qname);
-                       dns_name_copynf(qname, keyname);
+                       dns_name_copy(qname, keyname);
                        dns_name_getlabelsequence(keyname, 0, n - 1, keyname);
                } else {
                        static char hexdigits[16] = { '0', '1', '2', '3',
@@ -986,8 +986,8 @@ buildquery(dns_message_t *msg, const dns_name_t *name, dns_rdata_tkey_t *tkey,
        RETERR(dns_message_gettemprdataset(msg, &tkeyset));
        RETERR(dns_rdatalist_tordataset(tkeylist, tkeyset));
 
-       dns_name_copynf(name, qname);
-       dns_name_copynf(name, aname);
+       dns_name_copy(name, qname);
+       dns_name_copy(name, aname);
 
        ISC_LIST_APPEND(qname->list, question, link);
        ISC_LIST_APPEND(aname->list, tkeyset, link);
@@ -1531,7 +1531,7 @@ dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg,
                dns_fixedname_t fixed;
 
                dns_fixedname_init(&fixed);
-               dns_name_copynf(tkeyname, dns_fixedname_name(&fixed));
+               dns_name_copy(tkeyname, dns_fixedname_name(&fixed));
                tkeyname = dns_fixedname_name(&fixed);
 
                tkey.common.rdclass = dns_rdataclass_any;

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index a35a959179d0fb29702f96960e8dec57011a2993..1a6c729b1b1163377c9ef714c719eaff72e43cb1 100644 (file)
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -1020,7 +1020,7 @@ dns_tsig_sign(dns_message_t *msg) {
        if (ret != ISC_R_SUCCESS) {
                goto cleanup_rdata;
        }
-       dns_name_copynf(&key->name, owner);
+       dns_name_copy(&key->name, owner);
 
        ret = dns_message_gettemprdatalist(msg, &datalist);
        if (ret != ISC_R_SUCCESS) {

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index e54fc70b2eca8ab9d47285604c35278c54ea22cc..18c35466e8819b4d5fa1b32fef6bd29fd6498710 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1472,7 +1472,7 @@ again:
                         * for the NSEC3 NOQNAME proof.
                         */
                        closest = dns_fixedname_name(&val->closest);
-                       dns_name_copynf(wild, closest);
+                       dns_name_copy(wild, closest);
                        labels = dns_name_countlabels(closest) - 1;
                        dns_name_getlabelsequence(closest, 1, labels, closest);
                        val->attributes |= VALATTR_NEEDNOQNAME;
@@ -2212,7 +2212,7 @@ findnsec3proofs(dns_validator_t *val) {
                validator_log(val, ISC_LOG_DEBUG(3),
                              "closest encloser from wildcard signature '%s'",
                              namebuf);
-               dns_name_copynf(dns_fixedname_name(&val->closest), closest);
+               dns_name_copy(dns_fixedname_name(&val->closest), closest);
                closestp = NULL;
                setclosestp = NULL;
        } else {
@@ -2657,7 +2657,7 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) {
        dns_name_t *tname = dns_fixedname_initname(&val->fname);
 
        if (val->labels == dns_name_countlabels(val->event->name)) {
-               dns_name_copynf(val->event->name, tname);
+               dns_name_copy(val->event->name, tname);
        } else {
                dns_name_split(val->event->name, val->labels, NULL, tname);
        }
@@ -2893,7 +2893,7 @@ proveunsecure(dns_validator_t *val, bool have_ds, bool resume) {
         */
        val->attributes |= VALATTR_INSECURITY;
 
-       dns_name_copynf(val->event->name, secroot);
+       dns_name_copy(val->event->name, secroot);
 
        /*
         * If this is a response to a DS query, we need to look in

diff --git a/lib/dns/view.c b/lib/dns/view.c
index 2c5662473ef3d6510ad354dfdbd288edcba0e36d..0d2f854509745c80ad854eb15a0baf2bbf2d31cf 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1384,7 +1384,7 @@ db_find:
                         * We found an answer, but the cache may be better.
                         */
                        zfname = dns_fixedname_name(&zfixedname);
-                       dns_name_copynf(fname, zfname);
+                       dns_name_copy(fname, zfname);
                        dns_rdataset_clone(rdataset, &zrdataset);
                        dns_rdataset_disassociate(rdataset);
                        if (sigrdataset != NULL &&
@@ -1446,9 +1446,9 @@ finish:
                                dns_rdataset_disassociate(sigrdataset);
                        }
                }
-               dns_name_copynf(zfname, fname);
+               dns_name_copy(zfname, fname);
                if (dcname != NULL) {
-                       dns_name_copynf(zfname, dcname);
+                       dns_name_copy(zfname, dcname);
                }
                dns_rdataset_clone(&zrdataset, rdataset);
                if (sigrdataset != NULL &&
@@ -1472,7 +1472,7 @@ finish:
                        }
                        result = ISC_R_NOTFOUND;
                } else if (dcname != NULL) {
-                       dns_name_copynf(fname, dcname);
+                       dns_name_copy(fname, dcname);
                }
        }
 
@@ -2272,7 +2272,7 @@ dns_view_searchdlz(dns_view_t *view, const dns_name_t *name,
                 */
                for (i = namelabels; i > minlabels && i > 1; i--) {
                        if (i == namelabels) {
-                               dns_name_copynf(name, zonename);
+                               dns_name_copy(name, zonename);
                        } else {
                                dns_name_split(name, i, NULL, zonename);
                        }

diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index 1eba5af96d384130a7dd77d7658f385907494a24..1683cccb7de7a3e3d177197671cccc6e759730c6 100644 (file)
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -576,7 +576,7 @@ dns_name_caseequal
 dns_name_clone
 dns_name_compare
 dns_name_concatenate
-dns_name_copynf
+dns_name_copy
 dns_name_countlabels
 dns_name_digest
 dns_name_downcase

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 3c5ef3c5a130ff4762eddc32084aa3661e37ce08..775a8f0034984d1f32dc12ab3e00b4c9d687bba6 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -3248,7 +3248,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
                /*
                 * Remember bottom of zone due to NS.
                 */
-               dns_name_copynf(name, bottom);
+               dns_name_copy(name, bottom);
 
                result = dns_rdataset_first(&rdataset);
                while (result == ISC_R_SUCCESS) {
@@ -3272,7 +3272,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
                        /*
                         * Remember bottom of zone due to DNAME.
                         */
-                       dns_name_copynf(name, bottom);
+                       dns_name_copy(name, bottom);
                        dns_rdataset_disassociate(&rdataset);
                }
 
@@ -8429,7 +8429,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                 * Remember the obscuring name so that
                                 * we skip all obscured names.
                                 */
-                               dns_name_copynf(found, name);
+                               dns_name_copy(found, name);
                                delegation = true;
                                goto next_addnode;
                        }
@@ -8692,7 +8692,7 @@ zone_nsec3chain(dns_zone_t *zone) {
                                 * Remember the obscuring name so that
                                 * we skip all obscured names.
                                 */
-                               dns_name_copynf(found, name);
+                               dns_name_copy(found, name);
                                delegation = true;
                                goto next_removenode;
                        }
@@ -9440,7 +9440,7 @@ zone_sign(dns_zone_t *zone) {
                                 * Remember the obscuring name so that
                                 * we skip all obscured names.
                                 */
-                               dns_name_copynf(found, name);
+                               dns_name_copy(found, name);
                                is_bottom_of_zone = true;
                                goto next_node;
                        }

diff --git a/lib/dns/zoneverify.c b/lib/dns/zoneverify.c
index a7780aa87e9faefe93ae0d580be268161506624f..4ddb2430c59738a1d4a3f1705d685b8a5f8c166a 100644 (file)
--- a/lib/dns/zoneverify.c
+++ b/lib/dns/zoneverify.c
@@ -1783,11 +1783,11 @@ verify_nodes(vctx_t *vctx, isc_result_t *vresult) {
                }
                if (is_delegation(vctx, name, node, NULL)) {
                        zonecut = dns_fixedname_name(&fzonecut);
-                       dns_name_copynf(name, zonecut);
+                       dns_name_copy(name, zonecut);
                        isdelegation = true;
                } else if (has_dname(vctx, node)) {
                        zonecut = dns_fixedname_name(&fzonecut);
-                       dns_name_copynf(name, zonecut);
+                       dns_name_copy(name, zonecut);
                }
                nextnode = NULL;
                result = dns_dbiterator_next(dbiter);
@@ -1866,7 +1866,7 @@ verify_nodes(vctx_t *vctx, isc_result_t *vresult) {
                } else {
                        prevname = dns_fixedname_name(&fprevname);
                }
-               dns_name_copynf(name, prevname);
+               dns_name_copy(name, prevname);
                if (*vresult == ISC_R_SUCCESS) {
                        *vresult = tvresult;
                }

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 7d01872f53f4dbc7d786e44b3c810198bd81ffe5..a6fcaec824001792842db52354af2f40d6dfc9de 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -2885,7 +2885,7 @@ rpz_rrset_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type,
                        query_rpzfetch(client, name, type);
                        result = DNS_R_NXRRSET;
                } else {
-                       dns_name_copynf(name, st->r_name);
+                       dns_name_copy(name, st->r_name);
                        result = ns_query_recurse(client, type, st->r_name,
                                                  NULL, NULL, resuming);
                        if (result == ISC_R_SUCCESS) {
@@ -3151,7 +3151,7 @@ rpz_save_p(dns_rpz_st_t *st, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type,
        st->m.rpz = rpz;
        st->m.type = rpz_type;
        st->m.policy = policy;
-       dns_name_copynf(p_name, st->p_name);
+       dns_name_copy(p_name, st->p_name);
        st->m.prefix = prefix;
        st->m.result = result;
        SAVE(st->m.zone, *zonep);
@@ -4672,7 +4672,7 @@ again:
                                                  found);
                }
        } else if (found != NULL) {
-               dns_name_copynf(&name, found);
+               dns_name_copy(&name, found);
        }
        return;
 }
@@ -4885,7 +4885,7 @@ redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset,
        }
 
        CTRACE(ISC_LOG_DEBUG(3), "redirect: found data: done");
-       dns_name_copynf(found, name);
+       dns_name_copy(found, name);
        if (dns_rdataset_isassociated(rdataset)) {
                dns_rdataset_disassociate(rdataset);
        }
@@ -4994,7 +4994,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset,
                        return (ISC_R_NOTFOUND);
                }
        } else {
-               dns_name_copynf(redirectname, client->view->redirectzone);
+               dns_name_copy(redirectname, client->view->redirectzone);
        }
 
        options = 0;
@@ -5070,7 +5070,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset,
        result = dns_name_concatenate(found, dns_rootname, found, NULL);
        RUNTIME_CHECK(result == ISC_R_SUCCESS);
 
-       dns_name_copynf(found, name);
+       dns_name_copy(found, name);
        if (dns_rdataset_isassociated(rdataset)) {
                dns_rdataset_disassociate(rdataset);
        }
@@ -5819,7 +5819,7 @@ query_lookup(query_ctx_t *qctx) {
         * Fixup fname and sigrdataset.
         */
        if (qctx->dns64 && qctx->rpz) {
-               dns_name_copynf(qctx->client->query.qname, qctx->fname);
+               dns_name_copy(qctx->client->query.qname, qctx->fname);
                if (qctx->sigrdataset != NULL &&
                    dns_rdataset_isassociated(qctx->sigrdataset)) {
                        dns_rdataset_disassociate(qctx->sigrdataset);
@@ -6252,14 +6252,14 @@ recparam_update(ns_query_recparam_t *param, dns_rdatatype_t qtype,
                param->qname = NULL;
        } else {
                param->qname = dns_fixedname_initname(&param->fqname);
-               dns_name_copynf(qname, param->qname);
+               dns_name_copy(qname, param->qname);
        }
 
        if (qdomain == NULL) {
                param->qdomain = NULL;
        } else {
                param->qdomain = dns_fixedname_initname(&param->fqdomain);
-               dns_name_copynf(qdomain, param->qdomain);
+               dns_name_copy(qdomain, param->qdomain);
        }
 }
 static atomic_uint_fast32_t last_soft, last_hard;
@@ -6638,7 +6638,7 @@ query_resume(query_ctx_t *qctx) {
                tname = dns_fixedname_name(&qctx->event->foundname);
        }
 
-       dns_name_copynf(tname, qctx->fname);
+       dns_name_copy(tname, qctx->fname);
 
        if (qctx->rpz_st != NULL &&
            (qctx->rpz_st->state & DNS_RPZ_RECURSING) != 0) {
@@ -7143,7 +7143,7 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) {
                SAVE(qctx->rpz_st->q.node, qctx->node);
                SAVE(qctx->rpz_st->q.rdataset, qctx->rdataset);
                SAVE(qctx->rpz_st->q.sigrdataset, qctx->sigrdataset);
-               dns_name_copynf(qctx->fname, qctx->rpz_st->fname);
+               dns_name_copy(qctx->fname, qctx->rpz_st->fname);
                qctx->rpz_st->q.result = result;
                qctx->client->query.attributes |= NS_QUERYATTR_RECURSING;
                return (ISC_R_COMPLETE);
@@ -7168,7 +7168,7 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) {
                 * we looked up even if we were stopped short
                 * in recursion or for a deferral.
                 */
-               dns_name_copynf(qctx->client->query.qname, qctx->fname);
+               dns_name_copy(qctx->client->query.qname, qctx->fname);
                rpz_clean(&qctx->zone, &qctx->db, &qctx->node, NULL);
                if (qctx->rpz_st->m.rdataset != NULL) {
                        ns_client_putrdataset(qctx->client, &qctx->rdataset);
@@ -7344,7 +7344,7 @@ query_rpzcname(query_ctx_t *qctx, dns_name_t *cname) {
                        return (result);
                }
        } else {
-               dns_name_copynf(cname, qctx->fname);
+               dns_name_copy(cname, qctx->fname);
        }
 
        ns_client_keepname(client, qctx->fname, qctx->dbuf);
@@ -8651,7 +8651,7 @@ query_prepare_delegation_response(query_ctx_t *qctx) {
         * it here in case we need it.
         */
        dns_fixedname_init(&qctx->dsname);
-       dns_name_copynf(qctx->fname, dns_fixedname_name(&qctx->dsname));
+       dns_name_copy(qctx->fname, dns_fixedname_name(&qctx->dsname));
 
        /*
         * This is the best answer.
@@ -9127,7 +9127,7 @@ query_nodata(query_ctx_t *qctx, isc_result_t res) {
                                return (ns_query_done(qctx));
                        }
                }
-               dns_name_copynf(qctx->client->query.qname, qctx->fname);
+               dns_name_copy(qctx->client->query.qname, qctx->fname);
                qctx->dns64 = false;
 #ifdef dns64_bis_return_excluded_addresses
                /*
@@ -9538,8 +9538,7 @@ query_redirect(query_ctx_t *qctx) {
                SAVE(qctx->client->query.redirect.sigrdataset,
                     qctx->sigrdataset);
                qctx->client->query.redirect.result = DNS_R_NCACHENXDOMAIN;
-               dns_name_copynf(qctx->fname,
-                               qctx->client->query.redirect.fname);
+               dns_name_copy(qctx->fname, qctx->client->query.redirect.fname);
                qctx->client->query.redirect.authoritative =
                        qctx->authoritative;
                qctx->client->query.redirect.is_zone = qctx->is_zone;
@@ -9648,7 +9647,7 @@ query_synthnodata(query_ctx_t *qctx, const dns_name_t *signer,
                goto cleanup;
        }
 
-       dns_name_copynf(signer, name);
+       dns_name_copy(signer, name);
 
        /*
         * Add SOA record. Omit the RRSIG if DNSSEC was not requested.
@@ -9713,7 +9712,7 @@ query_synthwildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset,
                result = ISC_R_NOMEMORY;
                goto cleanup;
        }
-       dns_name_copynf(qctx->client->query.qname, name);
+       dns_name_copy(qctx->client->query.qname, name);
 
        cloneset = ns_client_newrdataset(qctx->client);
        if (cloneset == NULL) {
@@ -9804,7 +9803,7 @@ query_synthcnamewildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset,
        RUNTIME_CHECK(result == ISC_R_SUCCESS);
        dns_rdata_reset(&rdata);
 
-       dns_name_copynf(&cname.cname, tname);
+       dns_name_copy(&cname.cname, tname);
 
        dns_rdata_freestruct(&cname);
        ns_client_qnamereplace(qctx->client, tname);
@@ -9866,7 +9865,7 @@ query_synthnxdomain(query_ctx_t *qctx, dns_name_t *nowild,
                goto cleanup;
        }
 
-       dns_name_copynf(signer, name);
+       dns_name_copy(signer, name);
 
        /*
         * Add SOA record. Omit the RRSIG if DNSSEC was not requested.
@@ -9896,7 +9895,7 @@ query_synthnxdomain(query_ctx_t *qctx, dns_name_t *nowild,
                        goto cleanup;
                }
 
-               dns_name_copynf(nowild, name);
+               dns_name_copy(nowild, name);
 
                cloneset = ns_client_newrdataset(qctx->client);
                clonesigset = ns_client_newrdataset(qctx->client);
@@ -9949,7 +9948,7 @@ checksignames(dns_name_t *signer, dns_rdataset_t *sigrdataset) {
                result = dns_rdata_tostruct(&rdata, &rrsig, NULL);
                RUNTIME_CHECK(result == ISC_R_SUCCESS);
                if (dns_name_countlabels(signer) == 0) {
-                       dns_name_copynf(&rrsig.signer, signer);
+                       dns_name_copy(&rrsig.signer, signer);
                } else if (!dns_name_equal(signer, &rrsig.signer)) {
                        return (ISC_R_FAILURE);
                }
@@ -10370,8 +10369,8 @@ query_cname(query_ctx_t *qctx) {
            (qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) != 0)
        {
                dns_fixedname_init(&qctx->wildcardname);
-               dns_name_copynf(qctx->fname,
-                               dns_fixedname_name(&qctx->wildcardname));
+               dns_name_copy(qctx->fname,
+                             dns_fixedname_name(&qctx->wildcardname));
                qctx->need_wildcardproof = true;
        }
 
@@ -10416,7 +10415,7 @@ query_cname(query_ctx_t *qctx) {
        RUNTIME_CHECK(result == ISC_R_SUCCESS);
        dns_rdata_reset(&rdata);
 
-       dns_name_copynf(&cname.cname, tname);
+       dns_name_copy(&cname.cname, tname);
 
        dns_rdata_freestruct(&cname);
        ns_client_qnamereplace(qctx->client, tname);
@@ -10481,8 +10480,8 @@ query_dname(query_ctx_t *qctx) {
            (qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) != 0)
        {
                dns_fixedname_init(&qctx->wildcardname);
-               dns_name_copynf(qctx->fname,
-                               dns_fixedname_name(&qctx->wildcardname));
+               dns_name_copy(qctx->fname,
+                             dns_fixedname_name(&qctx->wildcardname));
                qctx->need_wildcardproof = true;
        }
 
@@ -10518,7 +10517,7 @@ query_dname(query_ctx_t *qctx) {
        RUNTIME_CHECK(result == ISC_R_SUCCESS);
        dns_rdata_reset(&rdata);
 
-       dns_name_copynf(&dname.dname, tname);
+       dns_name_copy(&dname.dname, tname);
        dns_rdata_freestruct(&dname);
 
        /*
@@ -10617,7 +10616,7 @@ query_addcname(query_ctx_t *qctx, dns_trust_t trust, dns_ttl_t ttl) {
                return (result);
        }
 
-       dns_name_copynf(client->query.qname, aname);
+       dns_name_copy(client->query.qname, aname);
 
        result = dns_message_gettemprdatalist(client->message, &rdatalist);
        if (result != ISC_R_SUCCESS) {
@@ -10687,8 +10686,8 @@ query_prepresponse(query_ctx_t *qctx) {
            (qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) != 0)
        {
                dns_fixedname_init(&qctx->wildcardname);
-               dns_name_copynf(qctx->fname,
-                               dns_fixedname_name(&qctx->wildcardname));
+               dns_name_copy(qctx->fname,
+                             dns_fixedname_name(&qctx->wildcardname));
                qctx->need_wildcardproof = true;
        }
 
@@ -11279,7 +11278,7 @@ again:
                /*
                 * Find the closest encloser.
                 */
-               dns_name_copynf(name, cname);
+               dns_name_copy(name, cname);
                while (result == DNS_R_NXDOMAIN) {
                        labels = dns_name_countlabels(cname) - 1;
                        /*
@@ -11339,7 +11338,7 @@ again:
                 */
                labels = dns_name_countlabels(cname) + 1;
                if (dns_name_countlabels(name) == labels) {
-                       dns_name_copynf(name, wname);
+                       dns_name_copy(name, wname);
                } else {
                        dns_name_split(name, labels, NULL, wname);
                }

diff --git a/lib/ns/update.c b/lib/ns/update.c
index 3cb93569982e48aba74057adcab881d0d5987287..2820ff769ee1c077ee00fbdb6f582c62d5e14882 100644 (file)
--- a/lib/ns/update.c
+++ b/lib/ns/update.c
@@ -713,7 +713,7 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
                add_rr_prepare_ctx_t *ctx = rr_action_data;
 
                ctx->oldname = dns_fixedname_initname(&fixed);
-               dns_name_copynf(name, ctx->oldname);
+               dns_name_copy(name, ctx->oldname);
                dns_rdataset_getownercase(&rdataset, ctx->oldname);
        }
 
@@ -1057,7 +1057,7 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db,
        t = ISC_LIST_HEAD(temp->tuples);
        while (t != NULL) {
                name = &t->name;
-               dns_name_copynf(name, tmpname);
+               dns_name_copy(name, tmpname);
                *typep = t->rdata.type;
 
                /* A new unique name begins here. */