clones/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2024-09-21 14:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup compile for clean_additional changes

Browse Source 
git-svn-id: file:///svn/unbound/trunk@4211 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-06-07 09:24:33 +00:00
parent 7e9d37acae
commit 0992621839
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
validator/val_utils.c
View File

@ -54,6 +54,7 @@
#include "util/net_help.h"
#include "util/module.h"
#include "util/regional.h"
#include "util/config_file.h"
#include "sldns/wire2str.h"
#include "sldns/parseutil.h"
@ -914,7 +915,7 @@ void val_reply_remove_auth(struct reply_info* rep, size_t index)
}
void
val_check_nonsecure(struct val_env* ve, struct reply_info* rep)
val_check_nonsecure(struct module_env* env, struct reply_info* rep)
{
size_t i;
/* authority */
@ -955,7 +956,7 @@ val_check_nonsecure(struct val_env* ve, struct reply_info* rep)
}
}
/* additional */
if(!ve->clean_additional)
if(!env->cfg->val_clean_additional)
return;
for(i=rep->an_numrrsets+rep->ns_numrrsets; i<rep->rrset_count; i++) {
if(((struct packed_rrset_data*)rep->rrsets[i]->entry.data)

4
validator/val_utils.h
View File

@ -306,10 +306,10 @@ void val_reply_remove_auth(struct reply_info* rep, size_t index);
* So that unsigned data does not get let through to clients, when we have
* found the data to be secure.
*
* @param ve: validator environment with cleaning options.
* @param env: environment with cleaning options.
* @param rep: reply to dump all nonsecure stuff out of.
*/
void val_check_nonsecure(struct val_env* ve, struct reply_info* rep);
void val_check_nonsecure(struct module_env* env, struct reply_info* rep);
/**
* Mark all unchecked rrset entries not below a trust anchor as indeterminate.

2
validator/validator.c
View File

@ -2128,7 +2128,7 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
* a different signer name). And drop additional rrsets
* that are not secure (if clean-additional option is set) */
/* this may cause the msg to be marked bogus */
val_check_nonsecure(ve, vq->orig_msg->rep);
val_check_nonsecure(qstate->env, vq->orig_msg->rep);
if(vq->orig_msg->rep->security == sec_status_secure) {
log_query_info(VERB_DETAIL, "validation success",
&qstate->qinfo);