From: Wouter Wijngaards <wouter@NLnetLabs.nl>
Date: Tue, 14 Dec 2010 14:41:38 +0000 (+0000)
Subject: Fix ldns_resolver_send.
X-Git-Tag: release-1.6.8rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c96b64235a22750e29cff27107239b365d03f5f;p=thirdparty%2Fldns.git

Fix ldns_resolver_send.
---

diff --git a/Changelog b/Changelog
index b7cf9c27..cdb8f0f6 100644
--- a/Changelog
+++ b/Changelog
@@ -7,6 +7,7 @@
 	* Drill: Print both SHA-1 and SHA-256 corresponding DS records.
 	* Print correct WHEN in query packet (is not always 1-1-1970)
 	* ldns-test-edns: new example tool that detects EDNS support.
+	* fix ldns_resolver_send without openssl.
 
 1.6.7	2010-11-08
 	* EXPERIMENTAL ecdsa implementation, please do not enable on real
diff --git a/resolver.c b/resolver.c
index ffb3b25d..735e6f14 100644
--- a/resolver.c
+++ b/resolver.c
@@ -1164,8 +1164,8 @@ ldns_resolver_send(ldns_pkt **answer, ldns_resolver *r, const ldns_rdf *name,
 	  Jelte
 	  should this go in pkt_prepare?
 	*/
-#ifdef HAVE_SSL
 	if (ldns_resolver_tsig_keyname(r) && ldns_resolver_tsig_keydata(r)) {
+#ifdef HAVE_SSL
 		status = ldns_pkt_tsig_sign(query_pkt,
 		                            ldns_resolver_tsig_keyname(r),
 		                            ldns_resolver_tsig_keydata(r),
@@ -1173,10 +1173,10 @@ ldns_resolver_send(ldns_pkt **answer, ldns_resolver *r, const ldns_rdf *name,
 		if (status != LDNS_STATUS_OK) {
 			return LDNS_STATUS_CRYPTO_TSIG_ERR;
 		}
-	}
 #else
-	return LDNS_STATUS_CRYPTO_TSIG_ERR;
+	        return LDNS_STATUS_CRYPTO_TSIG_ERR;
 #endif /* HAVE_SSL */
+	}
 
 	status = ldns_resolver_send_pkt(&answer_pkt, r, query_pkt);
 	ldns_pkt_free(query_pkt);