From: Michał Kępień <michal@isc.org>
Date: Fri, 15 Jun 2018 07:59:20 +0000 (+0200)
Subject: Rename verifyzone() to dns_zoneverify_dnssec()
X-Git-Tag: v9.13.2~31^2~35
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=7554e8d2ca4ccafd63013f1e9633c90264157614;p=thirdparty%2Fbind9.git

Rename verifyzone() to dns_zoneverify_dnssec()

This makes the function's name match the naming convention used for
libdns functions.
---

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index ed8e8f3a081..d857c844d0a 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -3913,8 +3913,8 @@ main(int argc, char *argv[]) {
 	TIME_NOW(&sign_finish);
 
 	if (!disable_zone_check)
-		verifyzone(gdb, gversion, gorigin, mctx,
-			   ignore_kskflag, keyset_kskonly);
+		dns_zoneverify_dnssec(gdb, gversion, gorigin, mctx,
+				      ignore_kskflag, keyset_kskonly);
 
 	if (outputformat != dns_masterformat_text) {
 		dns_masterrawheader_t header;
diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c
index 42207a148a7..c2362357506 100644
--- a/bin/dnssec/dnssec-verify.c
+++ b/bin/dnssec/dnssec-verify.c
@@ -323,8 +323,8 @@ main(int argc, char *argv[]) {
 	result = dns_db_newversion(gdb, &gversion);
 	check_result(result, "dns_db_newversion()");
 
-	verifyzone(gdb, gversion, gorigin, mctx,
-		   ignore_kskflag, keyset_kskonly);
+	dns_zoneverify_dnssec(gdb, gversion, gorigin, mctx, ignore_kskflag,
+			      keyset_kskonly);
 
 	dns_db_closeversion(gdb, &gversion, ISC_FALSE);
 	dns_db_detach(&gdb);
diff --git a/lib/dns/include/dns/zoneverify.h b/lib/dns/include/dns/zoneverify.h
index 6b7463e552d..facdcf9dbb2 100644
--- a/lib/dns/include/dns/zoneverify.h
+++ b/lib/dns/include/dns/zoneverify.h
@@ -32,8 +32,8 @@ ISC_LANG_BEGINDECLS
  *   present in the DNSKEY RRSET.
  */
 void
-verifyzone(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin,
-	   isc_mem_t *mctx, isc_boolean_t ignore_kskflag,
-	   isc_boolean_t keyset_kskonly);
+dns_zoneverify_dnssec(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin,
+		      isc_mem_t *mctx, isc_boolean_t ignore_kskflag,
+		      isc_boolean_t keyset_kskonly);
 
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in
index 0cedd31b95c..796dccb9e29 100644
--- a/lib/dns/win32/libdns.def.in
+++ b/lib/dns/win32/libdns.def.in
@@ -1334,7 +1334,7 @@ dns_zonemgr_shutdown
 dns_zonemgr_unreachable
 dns_zonemgr_unreachableadd
 dns_zonemgr_unreachabledel
-verifyzone
+dns_zoneverify_dnssec
 dns_zt_apply
 dns_zt_asyncload
 dns_zt_attach
diff --git a/lib/dns/zoneverify.c b/lib/dns/zoneverify.c
index fdaee1f9524..6b45bb7b628 100644
--- a/lib/dns/zoneverify.c
+++ b/lib/dns/zoneverify.c
@@ -1021,9 +1021,9 @@ verifyemptynodes(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin,
 }
 
 void
-verifyzone(dns_db_t *db, dns_dbversion_t *ver,
-	   dns_name_t *origin, isc_mem_t *mctx,
-	   isc_boolean_t ignore_kskflag, isc_boolean_t keyset_kskonly)
+dns_zoneverify_dnssec(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin,
+		      isc_mem_t *mctx, isc_boolean_t ignore_kskflag,
+		      isc_boolean_t keyset_kskonly)
 {
 	char algbuf[80];
 	dns_dbiterator_t *dbiter = NULL;