From: Mark Andrews <marka@isc.org>
Date: Tue, 3 Nov 2020 03:49:04 +0000 (+1100)
Subject: fctx->id was not initalised
X-Git-Tag: v9.16.9~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e554daa76ca749274aac24ba097b441ec2706806;p=thirdparty%2Fbind9.git

fctx->id was not initalised
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index d337ed92d3a..76da994ac5c 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4921,9 +4921,9 @@ log_ns_ttl(fetchctx_t *fctx, const char *where) {
 static isc_result_t
 fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
 	    const dns_name_t *domain, dns_rdataset_t *nameservers,
-	    const isc_sockaddr_t *client, unsigned int options,
-	    unsigned int bucketnum, unsigned int depth, isc_counter_t *qc,
-	    fetchctx_t **fctxp) {
+	    const isc_sockaddr_t *client, dns_messageid_t id,
+	    unsigned int options, unsigned int bucketnum, unsigned int depth,
+	    isc_counter_t *qc, fetchctx_t **fctxp) {
 	fetchctx_t *fctx;
 	isc_result_t result;
 	isc_result_t iresult;
@@ -5041,6 +5041,7 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
 	} else {
 		strlcpy(fctx->clientstr, "<unknown>", sizeof(fctx->clientstr));
 	}
+	fctx->id = id;
 	fctx->ns_ttl = 0;
 	fctx->ns_ttl_ok = false;
 
@@ -10843,7 +10844,7 @@ dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name,
 
 	if (fctx == NULL) {
 		result = fctx_create(res, name, type, domain, nameservers,
-				     client, options, bucketnum, depth, qc,
+				     client, id, options, bucketnum, depth, qc,
 				     &fctx);
 		if (result != ISC_R_SUCCESS) {
 			goto unlock;