From: Yuri Schaeffer <yuri@nlnetlabs.nl>
Date: Thu, 23 Apr 2015 14:51:36 +0000 (+0000)
Subject: Subnet module refused to accept no answer was available, causing a loop.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49886fd335361eee67255c3c2a75fa62c3dd8639;p=thirdparty%2Funbound.git

Subnet module refused to accept no answer was available, causing a loop.


git-svn-id: file:///svn/unbound/branches/edns-subnet@3412 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index b1638fbad..2b4865a0b 100644
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -277,6 +277,8 @@ eval_response(struct module_qstate *qstate, int id)
 	struct edns_data *c_out = &qstate->edns_client_out;/* will send to client */
 	struct edns_data *s_in  = &qstate->edns_server_in; /* rcvd from auth */
 	struct edns_data *s_out = &qstate->edns_server_out;/* sent to auth */
+
+	if (!qstate->return_msg) return module_error;
 	
 	/** We have not asked for subnet data */
 	if (!s_out->subnet_sent) {
@@ -368,8 +370,7 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
 	/* Query handed back by next module, we have a 'final' answer */
 	if(event == module_event_moddone) {
 		verbose(VERB_QUERY, "subnet: done");
-		if (qstate->return_msg)
-			qstate->ext_state[id] = eval_response(qstate, id);
+		qstate->ext_state[id] = eval_response(qstate, id);
 		return;
 	}
 	/* We are being revisited */