From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 12 Aug 2008 06:56:53 +0000 (+0000)
Subject: (res_nmkquery): Call ns_name_compress directly instead of going through dn_comp.
X-Git-Tag: cvs/fedora-glibc-20080828T1623~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be1c55f2657610f649ecda983ac3b0fe9af7f86b;p=thirdparty%2Fglibc.git

(res_nmkquery): Call ns_name_compress directly instead of going through dn_comp.
---

diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index 416bf1c32bb..ae0cdb417eb 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -160,7 +160,10 @@ res_nmkquery(res_state statp,
 		if ((buflen -= QFIXEDSZ) < 0)
 			return (-1);
 	compose:
-		if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
+		n = ns_name_compress(dname, cp, buflen,
+				     (const u_char **) dnptrs,
+				     (const u_char **) lastdnptr);
+		if (n < 0)
 			return (-1);
 		cp += n;
 		buflen -= n;
@@ -172,7 +175,9 @@ res_nmkquery(res_state statp,
 		/*
 		 * Make an additional record for completion domain.
 		 */
-		n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
+		n = ns_name_compress((char *)data, cp, buflen,
+				     (const u_char **) dnptrs,
+				     (const u_char **) lastdnptr);
 		if (__builtin_expect (n < 0, 0))
 			return (-1);
 		cp += n;