From: Evan Hunt <each@isc.org>
Date: Tue, 21 Jan 2014 01:59:44 +0000 (-0800)
Subject: [v9_6] remove unnecessary test in name.c
X-Git-Tag: v9.6-ESV-R11~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5311ed76dd6897bf7cc2129c5564bf534488757a;p=thirdparty%2Fbind9.git

[v9_6] remove unnecessary test in name.c
---

diff --git a/lib/dns/name.c b/lib/dns/name.c
index 8704b7870d4..7d52271cefe 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -2078,12 +2078,7 @@ dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name,
 	if (copy_suffix) {
 		if ((suffix->attributes & DNS_NAMEATTR_ABSOLUTE) != 0)
 			absolute = ISC_TRUE;
-		if (suffix == name && suffix->buffer == target)
-			memmove(ndata + prefix_length, suffix->ndata,
-				suffix->length);
-		else
-			memmove(ndata + prefix_length, suffix->ndata,
-				suffix->length);
+		memmove(ndata + prefix_length, suffix->ndata, suffix->length);
 	}
 
 	/*