named-checkconf failed to report dnstap-output missing

from named.conf when dnstap was specified

(cherry picked from commit a4f38bec6a)
This commit is contained in:
Mark Andrews
2019-07-23 21:09:34 +10:00
parent 2a2d512ca3
commit 2524d76133
3 changed files with 18 additions and 0 deletions
+4
View File
@@ -1,3 +1,7 @@
5266. [bug] named-checkconf failed to report dnstap-output
missing from named.conf when dnstap was specified.
[GL #1136]
5265. [bug] DNS64 and RPZ nodata (CNAME *.) rules interacted badly
[GL #1106]
@@ -0,0 +1,4 @@
options {
dnstap { client; auth; };
recursion yes;
};
+10
View File
@@ -1478,6 +1478,16 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx,
result = ISC_R_FAILURE;
}
}
} else {
(void) cfg_map_get(options, "dnstap", &obj);
if (obj != NULL) {
cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
"'dnstap-output' must be set if 'dnstap' "
"is set");
if (result == ISC_R_SUCCESS) {
result = ISC_R_FAILURE;
}
}
}
#endif