[PATCH 10/12] build: Renamed duplicated dns_name_equal function name

[Andrzej Hajda]

Signed-off-by: Andrzej Hajda <andrzej.hajda at wp.pl>
---
 source4/rpc_server/dnsserver/dnsdata.c   |   18 ++++++++----------
 source4/rpc_server/dnsserver/dnsserver.h |    2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
index 3dc7dcc..9fa679c 100644
--- a/source4/rpc_server/dnsserver/dnsdata.c
+++ b/source4/rpc_server/dnsserver/dnsdata.c
@@ -920,8 +920,7 @@ int dns_name_compare(const struct ldb_message **m1, const struct ldb_message **m
 	return strcasecmp(ptr1, ptr2);
 }
 
-
-bool dns_name_equal(const char *name1, const char *name2)
+bool dnsserver_name_equal(const char *name1, const char *name2)
 {
 	size_t len1 = strlen(name1);
 	size_t len2 = strlen(name2);
@@ -934,7 +933,6 @@ bool dns_name_equal(const char *name1, const char *name2)
 	return strncasecmp(name1, name2, len1) == 0;
 }
 
-
 bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRecord *rec2)
 {
 	bool status;
@@ -952,14 +950,14 @@ bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRe
 		return strcmp(rec1->data.ipv4, rec2->data.ipv4) == 0;
 
 	case DNS_TYPE_NS:
-		return dns_name_equal(rec1->data.ns, rec2->data.ns);
+		return dnsserver_name_equal(rec1->data.ns, rec2->data.ns);
 
 	case DNS_TYPE_CNAME:
-		return dns_name_equal(rec1->data.cname, rec2->data.cname);
+		return dnsserver_name_equal(rec1->data.cname, rec2->data.cname);
 
 	case DNS_TYPE_SOA:
-		return dns_name_equal(rec1->data.soa.mname, rec2->data.soa.mname) == 0 &&
-			dns_name_equal(rec1->data.soa.rname, rec2->data.soa.rname) == 0 &&
+		return dnsserver_name_equal(rec1->data.soa.mname, rec2->data.soa.mname) == 0 &&
+			dnsserver_name_equal(rec1->data.soa.rname, rec2->data.soa.rname) == 0 &&
 			rec1->data.soa.serial == rec2->data.soa.serial &&
 			rec1->data.soa.refresh == rec2->data.soa.refresh &&
 			rec1->data.soa.retry == rec2->data.soa.retry &&
@@ -967,11 +965,11 @@ bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRe
 			rec1->data.soa.minimum == rec2->data.soa.minimum;
 
 	case DNS_TYPE_PTR:
-		return dns_name_equal(rec1->data.ptr, rec2->data.ptr);
+		return dnsserver_name_equal(rec1->data.ptr, rec2->data.ptr);
 
 	case DNS_TYPE_MX:
 		return rec1->data.mx.wPriority == rec2->data.srv.wPriority &&
-			dns_name_equal(rec1->data.mx.nameTarget, rec2->data.srv.nameTarget);
+			dnsserver_name_equal(rec1->data.mx.nameTarget, rec2->data.srv.nameTarget);
 
 	case DNS_TYPE_TXT:
 		if (rec1->data.txt.count != rec2->data.txt.count) {
@@ -991,7 +989,7 @@ bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRe
 		return rec1->data.srv.wPriority == rec2->data.srv.wPriority &&
 			rec1->data.srv.wWeight == rec2->data.srv.wWeight &&
 			rec1->data.srv.wPort == rec2->data.srv.wPort &&
-			dns_name_equal(rec1->data.srv.nameTarget, rec2->data.srv.nameTarget);
+			dnsserver_name_equal(rec1->data.srv.nameTarget, rec2->data.srv.nameTarget);
 
 	default:
 		DEBUG(0, ("dnsserver: unhandled record type %u", rec1->wType));
diff --git a/source4/rpc_server/dnsserver/dnsserver.h b/source4/rpc_server/dnsserver/dnsserver.h
index e3db0b2..b3423ed 100644
--- a/source4/rpc_server/dnsserver/dnsserver.h
+++ b/source4/rpc_server/dnsserver/dnsserver.h
@@ -186,7 +186,7 @@ char *dns_split_node_name(TALLOC_CTX *mem_ctx, const char *node_name, const char
 
 int dns_name_compare(const struct ldb_message **m1, const struct ldb_message **m2,
 			char *search_name);
-bool dns_name_equal(const char *name1, const char *name2);
+bool dnsserver_name_equal(const char *name1, const char *name2);
 bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRecord *rec2);
 
 void dnsp_to_dns_copy(TALLOC_CTX *mem_ctx, struct dnsp_DnssrvRpcRecord *dnsp,
-- 
1.7.9.5