diff options
author | des <des@FreeBSD.org> | 2015-12-04 13:26:12 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2015-12-04 13:26:12 +0000 |
commit | 72c7e45913048bf7a7a9f4f898363ea802ba3ab7 (patch) | |
tree | 658b312c2da2a4079aee851908bd5b4bd805ab2b /contrib/unbound/util/data/msgencode.c | |
parent | fc230dcf447eb45f054aa940c35313f825b926df (diff) | |
download | FreeBSD-src-72c7e45913048bf7a7a9f4f898363ea802ba3ab7.zip FreeBSD-src-72c7e45913048bf7a7a9f4f898363ea802ba3ab7.tar.gz |
MFH (r287917, r287918, r289063): upgrade to latest Unbound
MFH (r283301, r289592, r291582): rc script improvements
MFH (r287880): respect manually configured forwarders when using DHCP
MFH (r289321): deconfuse man page
PR: 184047 203580 204931
Diffstat (limited to 'contrib/unbound/util/data/msgencode.c')
-rw-r--r-- | contrib/unbound/util/data/msgencode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/unbound/util/data/msgencode.c b/contrib/unbound/util/data/msgencode.c index 26b5dea..43464e9 100644 --- a/contrib/unbound/util/data/msgencode.c +++ b/contrib/unbound/util/data/msgencode.c @@ -47,7 +47,7 @@ #include "util/log.h" #include "util/regional.h" #include "util/net_help.h" -#include "ldns/sbuffer.h" +#include "sldns/sbuffer.h" /** return code that means the function ran out of memory. negative so it does * not conflict with DNS rcodes. */ @@ -283,7 +283,7 @@ compress_owner(struct ub_packed_rrset_key* key, sldns_buffer* pkt, size_t owner_pos, uint16_t* owner_ptr, int owner_labs) { struct compress_tree_node* p; - struct compress_tree_node** insertpt; + struct compress_tree_node** insertpt = NULL; if(!*owner_ptr) { /* compress first time dname */ if((p = compress_tree_lookup(tree, key->rk.dname, |