diff options
author | Cy Schubert <cy@FreeBSD.org> | 2021-12-03 05:35:06 +0000 |
---|---|---|
committer | Cy Schubert <cy@FreeBSD.org> | 2021-12-03 05:35:06 +0000 |
commit | 68965ba955db755e0cf7c57882a1e99da5c47644 (patch) | |
tree | f8e722161681a766f4425cefdbe71f32f647fd14 /validator | |
parent | 625f1c1312fb7defbd148c8ba121a0cf058707ef (diff) | |
download | src-68965ba955db755e0cf7c57882a1e99da5c47644.tar.gz src-68965ba955db755e0cf7c57882a1e99da5c47644.zip |
unbound: Vendor import 1.14.0rc1vendor/unbound/1.14.0rc1
This vendor import was requested by glebius@ as it should fix unbound
crashes.
Reported by: glebius
Diffstat (limited to 'validator')
-rw-r--r-- | validator/autotrust.c | 4 | ||||
-rw-r--r-- | validator/validator.c | 4 | ||||
-rw-r--r-- | validator/validator.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/validator/autotrust.c b/validator/autotrust.c index 9643a3ddb38b..55e82c176dae 100644 --- a/validator/autotrust.c +++ b/validator/autotrust.c @@ -2377,7 +2377,9 @@ probe_anchor(struct module_env* env, struct trust_anchor* tp) edns.ext_rcode = 0; edns.edns_version = 0; edns.bits = EDNS_DO; - edns.opt_list = NULL; + edns.opt_list_in = NULL; + edns.opt_list_out = NULL; + edns.opt_list_inplace_cb_out = NULL; edns.padding_block_size = 0; if(sldns_buffer_capacity(buf) < 65535) edns.udp_size = (uint16_t)sldns_buffer_capacity(buf); diff --git a/validator/validator.c b/validator/validator.c index d4d48d956895..e6307284fb0e 100644 --- a/validator/validator.c +++ b/validator/validator.c @@ -140,7 +140,7 @@ val_apply_cfg(struct module_env* env, struct val_env* val_env, val_env->max_restart = cfg->val_max_restart; c = cfg_count_numbers(cfg->val_nsec3_key_iterations); if(c < 1 || (c&1)) { - log_err("validator: unparseable or odd nsec3 key " + log_err("validator: unparsable or odd nsec3 key " "iterations: %s", cfg->val_nsec3_key_iterations); return 0; } @@ -484,7 +484,7 @@ generate_keytag_query(struct module_qstate* qstate, int id, return 0; } - /* Not interrested in subquery response. Restore the ext_state, + /* Not interested in subquery response. Restore the ext_state, * that might be changed by generate_request() */ qstate->ext_state[id] = ext_state; diff --git a/validator/validator.h b/validator/validator.h index a928e10a65d8..a97eab25bc4a 100644 --- a/validator/validator.h +++ b/validator/validator.h @@ -68,7 +68,7 @@ struct config_strlist; #define SENTINEL_IS "root-key-sentinel-is-ta-" /** Root key sentinel is not ta preamble */ #define SENTINEL_NOT "root-key-sentinel-not-ta-" -/** Root key sentinal keytag length */ +/** Root key sentinel keytag length */ #define SENTINEL_KEYTAG_LEN 5 /** |