From: Kai Blin <kai@samba.org>
Date: Wed, 29 Oct 2014 12:39:16 +0000 (+0100)
Subject: dns: Also pass nsrecs to handle_question()
X-Git-Tag: talloc-2.1.4~441
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bda1a7320f72049cf7aad2233899eaf2a55d6973;p=thirdparty%2Fsamba.git

dns: Also pass nsrecs to handle_question()

Signed-off-by: Kai Blin <kai@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source4/dns_server/dns_query.c b/source4/dns_server/dns_query.c
index b510ccc2338..aa79f1f7b02 100644
--- a/source4/dns_server/dns_query.c
+++ b/source4/dns_server/dns_query.c
@@ -256,13 +256,15 @@ static WERROR ask_forwarder_recv(
 static WERROR handle_question(struct dns_server *dns,
 			      TALLOC_CTX *mem_ctx,
 			      const struct dns_name_question *question,
-			      struct dns_res_rec **answers, uint16_t *ancount)
+			      struct dns_res_rec **answers, uint16_t *ancount,
+			      struct dns_res_rec **nsrecs, uint16_t *nscount)
 {
 	struct dns_res_rec *ans = *answers;
+	struct dns_res_rec *ns = *nsrecs;
 	WERROR werror, werror_return;
 	unsigned int ri;
 	struct dnsp_DnssrvRpcRecord *recs;
-	uint16_t rec_count, ai = *ancount;
+	uint16_t rec_count, ai = *ancount, ni = *nscount;
 	struct ldb_dn *dn = NULL;
 
 	werror = dns_name2dn(dns, mem_ctx, question->name, &dn);
@@ -315,7 +317,7 @@ static WERROR handle_question(struct dns_server *dns,
 				return WERR_NOMEM;
 			}
 			/* and then call the lookup again */
-			werror = handle_question(dns, mem_ctx, new_q, &ans, &ai);
+			werror = handle_question(dns, mem_ctx, new_q, &ans, &ai, &ns, &ni);
 			if (!W_ERROR_IS_OK(werror)) {
 				return werror;
 			}
@@ -336,8 +338,11 @@ static WERROR handle_question(struct dns_server *dns,
 		werror_return = WERR_OK;
 	}
 
+done:
 	*ancount = ai;
 	*answers = ans;
+	*nscount = ni;
+	*nsrecs = ns;
 
 	return werror_return;
 }
@@ -612,7 +617,8 @@ struct tevent_req *dns_server_process_query_send(
 
 		req_state->flags |= DNS_FLAG_AUTHORITATIVE;
 		err = handle_question(dns, state, &in->questions[0],
-				      &state->answers, &state->ancount);
+				      &state->answers, &state->ancount,
+				      &state->nsrecs, &state->nscount);
 		if (tevent_req_werror(req, err)) {
 			return tevent_req_post(req, ev);
 		}