From: Matthijs Mekking <matje@NLnetLabs.nl>
Date: Mon, 7 May 2012 08:52:03 +0000 (+0000)
Subject: Fix dname_cat so that if dname1 is empty (root), dname1.dname2 == dname2
X-Git-Tag: release-1.6.13rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3460afac032fc4b5b30165e31faeb36d6b919e55;p=thirdparty%2Fldns.git

Fix dname_cat so that if dname1 is empty (root), dname1.dname2 == dname2
---

diff --git a/dname.c b/dname.c
index 9054e0f0..f3770fea 100644
--- a/dname.c
+++ b/dname.c
@@ -87,9 +87,6 @@ ldns_dname_cat(ldns_rdf *rd1, ldns_rdf *rd2)
 	if (left_size > 0 &&ldns_rdf_data(rd1)[left_size - 1] == 0) {
 		left_size--;
 	}
-        if(left_size == 0) {
-                return LDNS_STATUS_OK;
-        }
 
 	size = left_size + ldns_rdf_size(rd2);
 	newd = LDNS_XREALLOC(ldns_rdf_data(rd1), uint8_t, size);