upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix compile without threads, and remove unused variable.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4553 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-02-27 10:36:12 +00:00
parent 8de66ab4b8
commit 0e390bca00
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,5 +1,6 @@
27 February 2018: Wouter 27 February 2018: Wouter
- Fixup contrib/fastrpz.patch so that it applies. - Fixup contrib/fastrpz.patch so that it applies.
- Fix compile without threads, and remove unused variable.
22 February 2018: Ralph 22 February 2018: Ralph
- Save wildcard RRset from answer with original owner for use in - Save wildcard RRset from answer with original owner for use in

4
util/log.c
View file

@ -195,7 +195,11 @@ void* log_get_lock(void)
{ {
if(!key_created) if(!key_created)
return NULL; return NULL;
#ifndef THREADS_DISABLED
return (void*)&log_lock; return (void*)&log_lock;
#else
return NULL;
#endif
} }
void void

3
validator/val_neg.c
View file

@ -874,8 +874,7 @@ static uint8_t* reply_nsec_signer(struct reply_info* rep, size_t* signer_len,
return 0; return 0;
} }
void val_neg_addreply(struct val_neg_cache* neg, struct reply_info* rep, void val_neg_addreply(struct val_neg_cache* neg, struct reply_info* rep)
uint8_t* qname)
{ {
size_t i, need; size_t i, need;
struct ub_packed_rrset_key* soa; struct ub_packed_rrset_key* soa;

5
validator/val_neg.h
View file

@ -198,12 +198,9 @@ int val_neg_zone_compare(const void* a, const void* b);
* Insert NSECs from this message into the negative cache for reference. * Insert NSECs from this message into the negative cache for reference.
* @param neg: negative cache * @param neg: negative cache
* @param rep: reply with NSECs. * @param rep: reply with NSECs.
* @param qname: used to find correct signer, needed when rep does not contain
* a SOA record.
* Errors are ignored, means that storage is omitted. * Errors are ignored, means that storage is omitted.
*/ */
void val_neg_addreply(struct val_neg_cache* neg, struct reply_info* rep, void val_neg_addreply(struct val_neg_cache* neg, struct reply_info* rep);
uint8_t* qname);
/** /**
* Insert NSECs from this referral into the negative cache for reference. * Insert NSECs from this referral into the negative cache for reference.

4
validator/validator.c
View file

@ -2189,7 +2189,7 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
&qstate->qinfo); &qstate->qinfo);
if(!qstate->no_cache_store) { if(!qstate->no_cache_store) {
val_neg_addreply(qstate->env->neg_cache, val_neg_addreply(qstate->env->neg_cache,
vq->orig_msg->rep, qstate->qinfo.qname); vq->orig_msg->rep);
} }
} }
} }
@ -3120,7 +3120,7 @@ process_dlv_response(struct module_qstate* qstate, struct val_qstate* vq,
return; return;
} }
/* store NSECs into negative cache */ /* store NSECs into negative cache */
val_neg_addreply(ve->neg_cache, msg->rep, NULL); val_neg_addreply(ve->neg_cache, msg->rep);
/* was the lookup a failure? /* was the lookup a failure?
* if we have to go up into the DLV for a higher DLV anchor * if we have to go up into the DLV for a higher DLV anchor