From b5c4e6d861c8f34946e1633ea5b28a97499bc2ad Mon Sep 17 00:00:00 2001 From: des Date: Wed, 17 Feb 2016 11:38:43 +0000 Subject: MFH (r295535): use insecure-lan-zones option instead of hardcoded list Approved by: re (glebius) Relnotes: yes --- lib/libunbound/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile index 8519b77..3c66181 100644 --- a/lib/libunbound/Makefile +++ b/lib/libunbound/Makefile @@ -12,7 +12,7 @@ PRIVATELIB= CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} -SRCS= alloc.c autotrust.c config_file.c configlexer.l configparser.y \ +SRCS= alloc.c as112.c autotrust.c config_file.c configlexer.l configparser.y \ context.c dname.c dns.c dns64.c dnstree.c fptr_wlist.c infra.c \ iter_delegpt.c iter_donotq.c iter_fwd.c iter_hints.c iter_priv.c \ iter_resptype.c iter_scrub.c iter_utils.c iterator.c keyraw.c \ -- cgit v1.1 From 4aef3019513be35be30d1ea8ff5b072a743f99df Mon Sep 17 00:00:00 2001 From: des Date: Wed, 17 Feb 2016 11:40:03 +0000 Subject: MFH (r295536): fix double-free error when SSL connection fails PR: 206774 Submitted by: Christian Heckendorf Approved by: re (glebius) --- lib/libfetch/http.c | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c index 206648d..ca522a6 100644 --- a/lib/libfetch/http.c +++ b/lib/libfetch/http.c @@ -1435,7 +1435,6 @@ http_connect(struct url *URL, struct url *purl, const char *flags) } if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 && fetch_ssl(conn, URL, verbose) == -1) { - fetch_close(conn); /* grrr */ errno = EAUTH; fetch_syserr(); -- cgit v1.1