update unbound from upstream

15 files changed, 22 insertions, 22 deletions

diff --git a/external/unbound/ldns/keyraw.c b/external/unbound/sldns/keyraw.c
index 1ff07742b..59e8000f5 100644
--- a/external/unbound/ldns/keyraw.c
+++ b/external/unbound/sldns/keyraw.c
@@ -11,8 +11,8 @@
  */
 
 #include "config.h"
-#include "ldns/keyraw.h"
-#include "ldns/rrdef.h"
+#include "sldns/keyraw.h"
+#include "sldns/rrdef.h"
 
 #ifdef HAVE_SSL
 #include <openssl/ssl.h>
diff --git a/external/unbound/ldns/keyraw.h b/external/unbound/sldns/keyraw.h
index 8abe23509..8abe23509 100644
--- a/external/unbound/ldns/keyraw.h
+++ b/external/unbound/sldns/keyraw.h
diff --git a/external/unbound/ldns/parse.c b/external/unbound/sldns/parse.c
index a605e549f..35dee7196 100644
--- a/external/unbound/ldns/parse.c
+++ b/external/unbound/sldns/parse.c
@@ -8,9 +8,9 @@
  * See the file LICENSE for the license
  */
 #include "config.h"
-#include "ldns/parse.h"
-#include "ldns/parseutil.h"
-#include "ldns/sbuffer.h"
+#include "sldns/parse.h"
+#include "sldns/parseutil.h"
+#include "sldns/sbuffer.h"
 
 #include <limits.h>
 #include <strings.h>
diff --git a/external/unbound/ldns/parse.h b/external/unbound/sldns/parse.h
index 7b7456dd2..7b7456dd2 100644
--- a/external/unbound/ldns/parse.h
+++ b/external/unbound/sldns/parse.h
diff --git a/external/unbound/ldns/parseutil.c b/external/unbound/sldns/parseutil.c
index 28b344ede..2a2ebbb08 100644
--- a/external/unbound/ldns/parseutil.c
+++ b/external/unbound/sldns/parseutil.c
@@ -13,7 +13,7 @@
  */
 
 #include "config.h"
-#include "ldns/parseutil.h"
+#include "sldns/parseutil.h"
 #include <sys/time.h>
 #include <time.h>
 #include <ctype.h>
diff --git a/external/unbound/ldns/parseutil.h b/external/unbound/sldns/parseutil.h
index dfa1c2a2b..dfa1c2a2b 100644
--- a/external/unbound/ldns/parseutil.h
+++ b/external/unbound/sldns/parseutil.h
diff --git a/external/unbound/ldns/pkthdr.h b/external/unbound/sldns/pkthdr.h
index de9952ea7..de9952ea7 100644
--- a/external/unbound/ldns/pkthdr.h
+++ b/external/unbound/sldns/pkthdr.h
diff --git a/external/unbound/ldns/rrdef.c b/external/unbound/sldns/rrdef.c
index 9b4bf7cfe..72161d7b6 100644
--- a/external/unbound/ldns/rrdef.c
+++ b/external/unbound/sldns/rrdef.c
@@ -13,8 +13,8 @@
  * Defines resource record types and constants.
  */
 #include "config.h"
-#include "ldns/rrdef.h"
-#include "ldns/parseutil.h"
+#include "sldns/rrdef.h"
+#include "sldns/parseutil.h"
 
 /* classes  */
 static sldns_lookup_table sldns_rr_classes_data[] = {
diff --git a/external/unbound/ldns/rrdef.h b/external/unbound/sldns/rrdef.h
index 933bcdfbf..933bcdfbf 100644
--- a/external/unbound/ldns/rrdef.h
+++ b/external/unbound/sldns/rrdef.h
diff --git a/external/unbound/ldns/sbuffer.c b/external/unbound/sldns/sbuffer.c
index 3d087bfe2..a7fe53aa0 100644
--- a/external/unbound/ldns/sbuffer.c
+++ b/external/unbound/sldns/sbuffer.c
@@ -12,7 +12,7 @@
  * This file contains the definition of sldns_buffer, and functions to manipulate those.
  */
 #include "config.h"
-#include "ldns/sbuffer.h"
+#include "sldns/sbuffer.h"
 #include <stdarg.h>
 
 sldns_buffer *
diff --git a/external/unbound/ldns/sbuffer.h b/external/unbound/sldns/sbuffer.h
index 3ce874fc7..3ce874fc7 100644
--- a/external/unbound/ldns/sbuffer.h
+++ b/external/unbound/sldns/sbuffer.h
diff --git a/external/unbound/ldns/str2wire.c b/external/unbound/sldns/str2wire.c
index 931e28f84..8cda8c750 100644
--- a/external/unbound/ldns/str2wire.c
+++ b/external/unbound/sldns/str2wire.c
@@ -12,11 +12,11 @@
  * Parses text to wireformat.
  */
 #include "config.h"
-#include "ldns/str2wire.h"
-#include "ldns/wire2str.h"
-#include "ldns/sbuffer.h"
-#include "ldns/parse.h"
-#include "ldns/parseutil.h"
+#include "sldns/str2wire.h"
+#include "sldns/wire2str.h"
+#include "sldns/sbuffer.h"
+#include "sldns/parse.h"
+#include "sldns/parseutil.h"
 #include <ctype.h>
 #ifdef HAVE_TIME_H
 #include <time.h>
diff --git a/external/unbound/ldns/str2wire.h b/external/unbound/sldns/str2wire.h
index 94c893389..527074a15 100644
--- a/external/unbound/ldns/str2wire.h
+++ b/external/unbound/sldns/str2wire.h
@@ -16,7 +16,7 @@
 #define LDNS_STR2WIRE_H
 
 /* include rrdef for MAX_DOMAINLEN constant */
-#include <ldns/rrdef.h>
+#include <sldns/rrdef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/external/unbound/ldns/wire2str.c b/external/unbound/sldns/wire2str.c
index 81e173c78..cec3bc7b0 100644
--- a/external/unbound/ldns/wire2str.c
+++ b/external/unbound/sldns/wire2str.c
@@ -15,13 +15,13 @@
  * representation, as well as functions to print them.
  */
 #include "config.h"
-#include "ldns/wire2str.h"
-#include "ldns/str2wire.h"
-#include "ldns/rrdef.h"
-#include "ldns/pkthdr.h"
-#include "ldns/parseutil.h"
-#include "ldns/sbuffer.h"
-#include "ldns/keyraw.h"
+#include "sldns/wire2str.h"
+#include "sldns/str2wire.h"
+#include "sldns/rrdef.h"
+#include "sldns/pkthdr.h"
+#include "sldns/parseutil.h"
+#include "sldns/sbuffer.h"
+#include "sldns/keyraw.h"
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
diff --git a/external/unbound/ldns/wire2str.h b/external/unbound/sldns/wire2str.h
index 67f543566..67f543566 100644
--- a/external/unbound/ldns/wire2str.h
+++ b/external/unbound/sldns/wire2str.h