From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Mon, 19 Apr 2021 15:08:58 +0000 (+0200)
Subject: modules: fix knotd_conf() with NULL id
X-Git-Tag: v3.1.0~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f4fe36ccf0c05ea1d308d79bac8cef36eef617c;p=thirdparty%2Fknot-dns.git

modules: fix knotd_conf() with NULL id
---

diff --git a/src/knot/nameserver/query_module.c b/src/knot/nameserver/query_module.c
index 700a558b45..c7e5262780 100644
--- a/src/knot/nameserver/query_module.c
+++ b/src/knot/nameserver/query_module.c
@@ -510,10 +510,13 @@ knotd_conf_t knotd_conf(knotd_mod_t *mod, const yp_name_t *section_name,
 
 	conf_t *config = (mod->config != NULL) ? mod->config : conf();
 
-	const uint8_t *raw_id = (id != NULL) ? id->single.data : NULL;
-	size_t raw_id_len = (id != NULL) ? id->single.data_len : 0;
-	conf_val_t val = conf_rawid_get(config, section_name, item_name,
-	                                raw_id, raw_id_len);
+	conf_val_t val;
+	if (id != NULL) {
+		val = conf_rawid_get(config, section_name, item_name,
+		                     id->single.data, id->single.data_len);
+	} else {
+		val = conf_get(config, section_name, item_name);
+	}
 
 	set_conf_out(&out, &val);