Unbound 1.9.6rc1 pre-release

[Wouter Wijngaards]

Hi Tuomo,

On 05/12/2019 18:56, Tuomo Soini wrote:
> On Thu, 5 Dec 2019 12:24:43 +0100
> Wouter Wijngaards via Unbound-users <unbound-users at nlnetlabs.nl> wrote:
> 
>> Hi,
>>
>> Unbound 1.9.6rc1 pre-release is available:
>> https://nlnetlabs.nl/downloads/unbound/unbound-1.9.6rc1.tar.gz
>> sha256
>> 7e8a5e8856158d646504a853201bebfb389bb84e627a0a3362ba71f0c909ad79 pgp
>> https://nlnetlabs.nl/downloads/unbound/unbound-1.9.6rc1.tar.gz.asc
> 
> Doesn't build here.

The fix for the dname loop and the ipsecmod fix are interfering.  The
fix for that is simple, it can ignore the new argument.  Commit in
https://github.com/NLnetLabs/unbound/commit/f3c2d0572860545c04e2e189b0380c73e0139354

And fix looks like this:

diff --git a/ipsecmod/ipsecmod.c b/ipsecmod/ipsecmod.c
index 2e286e73..a1f40a51 100644
--- a/ipsecmod/ipsecmod.c
+++ b/ipsecmod/ipsecmod.c
@@ -337,7 +337,7 @@ call_hook(struct module_qstate* qstate, struct
ipsecmod_qstate* iq,
                /* Save the buffer pointers. */
                tempstring = s; tempstring_len = slen;
                w_temp = sldns_wire2str_ipseckey_scan(&tempdata,
&tempdata_len, &s,
-                       &slen, NULL, 0);
+                       &slen, NULL, 0, NULL);
                /* There was an error when parsing the IPSECKEY; reset
the buffer
                 * pointers to their previous values. */
                if(w_temp == -1) {


Best regards, Wouter

> 
> On rhel7 based system:
> 
> ipsecmod/ipsecmod.c: In function 'call_hook':
> ipsecmod/ipsecmod.c:340:4: error: too few arguments to function
> 'sldns_wire2str_ipseckey_scan' &slen, NULL, 0);
>     ^
> In file included from ipsecmod/ipsecmod.c:53:0:
> ./sldns/wire2str.h:814:5: note: declared here
>  int sldns_wire2str_ipseckey_scan(uint8_t** data, size_t* data_len,
> char** str, ^
> make: *** [ipsecmod.lo] Error 1
> 
> And on rhel6 based system:
> ipsecmod/ipsecmod.c: In function 'call_hook':
> ipsecmod/ipsecmod.c:340: error: too few arguments to function
> 'sldns_wire2str_ipseckey_scan' make: *** [ipsecmod.lo] Error 1
> 
> Same error, different diagnostics. Hope this help to fix the issue.
>