upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: nil: Fix missing field 'merge' initializer for the new cfg_clausedef_t

Browse source 
In !11121, a .merge member was added to cfg_clausedef_t.  This caused
a build failure with -Werror,-Wmissing-field-initializers enabled.
Add the missing initializer and set them all to NULL to match the
intent.

Merge branch 'ondrej/fix-compilation-on-macos' into 'main'

See merge request isc-projects/bind9!11302
This commit is contained in:
Ondřej Surý 2025-11-28 14:34:04 +01:00
commit 054d20205d
6 changed files with 595 additions and 542 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/delv/delv.c
View file

@ -164,8 +164,8 @@ static char anchortext[] = TRUST_ANCHORS;
static cfg_clausedef_t delv_clauses[] = { { "builtin-trust-anchors",
&cfg_type_builtin_dnsseckeys,
CFG_CLAUSEFLAG_MULTI },
{ NULL, NULL, 0 } };
CFG_CLAUSEFLAG_MULTI, NULL },
{ NULL, NULL, 0, NULL } };
static cfg_clausedef_t *delv_clausesets[] = { delv_clauses, NULL };
static cfg_type_t delv_type = { "delv", cfg_parse_mapbody, NULL,
NULL, &cfg_rep_map, delv_clausesets };

6
bin/plugins/filter-a.c
View file

@ -192,9 +192,9 @@ static cfg_type_t cfg_type_filter_a = {
};
static cfg_clausedef_t param_clauses[] = {
{ "filter-a", &cfg_type_bracketed_aml, 0 },
{ "filter-a-on-v6", &cfg_type_filter_a, 0 },
{ "filter-a-on-v4", &cfg_type_filter_a, 0 },
{ "filter-a", &cfg_type_bracketed_aml, 0, NULL },
{ "filter-a-on-v6", &cfg_type_filter_a, 0, NULL },
{ "filter-a-on-v4", &cfg_type_filter_a, 0, NULL },
};
static cfg_clausedef_t *param_clausesets[] = { param_clauses, NULL };

6
bin/plugins/filter-aaaa.c
View file

@ -192,9 +192,9 @@ static cfg_type_t cfg_type_filter_aaaa = {
};
static cfg_clausedef_t param_clauses[] = {
{ "filter-aaaa", &cfg_type_bracketed_aml, 0 },
{ "filter-aaaa-on-v4", &cfg_type_filter_aaaa, 0 },
{ "filter-aaaa-on-v6", &cfg_type_filter_aaaa, 0 },
{ "filter-aaaa", &cfg_type_bracketed_aml, 0, NULL },
{ "filter-aaaa-on-v4", &cfg_type_filter_aaaa, 0, NULL },
{ "filter-aaaa-on-v6", &cfg_type_filter_aaaa, 0, NULL },
};
static cfg_clausedef_t *param_clausesets[] = { param_clauses, NULL };

8
bin/plugins/synthrecord.c
View file

@ -402,10 +402,10 @@ synthrecord_entry(void *arg, void *cbdata, isc_result_t *resp) {
}
static cfg_clausedef_t synthrecord_cfgclauses[] = {
{ "prefix", &cfg_type_astring, 0 },
{ "origin", &cfg_type_astring, 0 },
{ "allow-synth", &cfg_type_bracketed_aml, 0 },
{ "ttl", &cfg_type_uint32, 0 }
{ "prefix", &cfg_type_astring, 0, NULL },
{ "origin", &cfg_type_astring, 0, NULL },
{ "allow-synth", &cfg_type_bracketed_aml, 0, NULL },
{ "ttl", &cfg_type_uint32, 0, NULL }
};
static cfg_clausedef_t *synthrecord_cfgparamsclausesets[] = {

6
bin/tests/system/hooks/driver/test-syncplugin.c
View file

@ -66,9 +66,9 @@ syncplugin__hook(void *arg, void *cbdata, isc_result_t *resp) {
}
static cfg_clausedef_t syncplugin__cfgclauses[] = {
{ "rcode", &cfg_type_astring, 0 },
{ "source", &cfg_type_astring, 0 },
{ "firstlbl", &cfg_type_qstring, CFG_CLAUSEFLAG_OPTIONAL }
{ "rcode", &cfg_type_astring, 0, NULL },
{ "source", &cfg_type_astring, 0, NULL },
{ "firstlbl", &cfg_type_qstring, CFG_CLAUSEFLAG_OPTIONAL, NULL }
};
static cfg_clausedef_t *syncplugin__cfgparamsclausesets[] = {

1107
lib/isccfg/namedconf.c
View file

File diff suppressed because it is too large Load diff