ldns/dns.h -> ldns/ldns.h

diff --git a/Makefile.in b/Makefile.in
index d11a22045e2edd95863074037f399248bb6aedba..1befa6618dd93a2002636e0eb775e809ca56e618 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,7 +53,7 @@ LIBDNS_HEADERS        =       $(srcdir)/ldns/error.h          \
                        $(srcdir)/ldns/higher.h         \
                        $(srcdir)/ldns/parse.h          \
                        $(srcdir)/ldns/rr_functions.h   \
-                       $(srcdir)/ldns/dns.h            \
+                       $(srcdir)/ldns/ldns.h           \
                        $(srcdir)/ldns/zone.h           \
                        $(srcdir)/ldns/update.h                 \
                        $(srcdir)/ldns/tsig.h

diff --git a/buffer.c b/buffer.c
index 3e70262f1d6e5949636a84ddb451fa8223137424..9aacf8bf38d2762c9e693cb70917344fb68ef9f7 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -9,7 +9,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 #include <ldns/buffer.h>
 
 ldns_buffer *

diff --git a/compat/b64_ntop.c b/compat/b64_ntop.c
index b2ff41b985f1b24b47c02bfb9b37cc5debdd72ce..56eb680af889af952024e9173e44bb2b4528918a 100644 (file)
--- a/compat/b64_ntop.c
+++ b/compat/b64_ntop.c
@@ -41,7 +41,7 @@
  */
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <sys/types.h>
 #include <sys/param.h>

diff --git a/compat/b64_pton.c b/compat/b64_pton.c
index d705ece0123d24aa5fff3b2cde895cee0c02bdf6..26e49f74298073a5ccd47ce4149aa763a7a564b3 100644 (file)
--- a/compat/b64_pton.c
+++ b/compat/b64_pton.c
@@ -41,7 +41,7 @@
  */
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <sys/types.h>
 #include <sys/param.h>

diff --git a/dname.c b/dname.c
index e4bf15e8ddc80566fc8ee1b9f0614b82519bb727..39833a4a9c0b0465a8569e952110feb0d07fd37a 100644 (file)
--- a/dname.c
+++ b/dname.c
@@ -15,7 +15,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <netinet/in.h>
 #include <sys/socket.h>

diff --git a/dnssec.c b/dnssec.c
index 157e1b36914f22d2358caeccd6977acfcf61db74..bc7c5d2ed702de7f4dfac18c9a2bb579388449e1 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -12,7 +12,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <strings.h>
 #include <time.h>

diff --git a/drill/chasetrace.c b/drill/chasetrace.c
index b70bc15d682c862ff58249f9ff4ec8d845390126..c7553580df7ef7d341368b37513e8a3da5809f30 100644 (file)
--- a/drill/chasetrace.c
+++ b/drill/chasetrace.c
@@ -9,7 +9,7 @@
  */
 
 #include "drill.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 /**
  * trace down from the root to name

diff --git a/drill/configure.ac b/drill/configure.ac
index bfd0bb5047f9a3d35ba8c3cb69b305eee784c353..f1c2db325be54d349aa3f75abdc33ce8d0ec218d 100644 (file)
--- a/drill/configure.ac
+++ b/drill/configure.ac
@@ -96,7 +96,7 @@ AC_CHECK_LIB(ldns, ldns_rr_new,, [
 
 AC_ARG_WITH(ldns, AC_HELP_STRING([--with-ldns=PATHNAME],[]))
 
-AC_CHECK_HEADER(ldns/dns.h,,  [
+AC_CHECK_HEADER(ldns/ldns.h,,  [
        AC_MSG_ERROR([Can't find ldns headers])
        ], [AC_INCLUDES_DEFAULT]
 )

diff --git a/drill/dnssec.c b/drill/dnssec.c
index ee615cab62d7f9092eac2c065383d2e83d9e8fb4..d9b90a6c0befddcbd275ad860bd917b2a40bfe62 100644 (file)
--- a/drill/dnssec.c
+++ b/drill/dnssec.c
@@ -9,7 +9,7 @@
  */
 
 #include "drill.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 /* get rr_type from a server from a server */
 ldns_rr_list *

diff --git a/drill/drill.c b/drill/drill.c
index 775255341c913488281ed75085e966f938b029cb..6d9b7a7bfcff29ec7bea6aca24388b9ff0a2d4db 100644 (file)
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -8,7 +8,7 @@
  */
 
 #include "drill.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #define IP6_ARPA_MAX_LEN 65
 

diff --git a/drill/drill_util.c b/drill/drill_util.c
index 1289fb2e8dd44b936426362232f50f2364c91f8f..54840e932c499d6f048570805e59b7070bea254e 100644 (file)
--- a/drill/drill_util.c
+++ b/drill/drill_util.c
@@ -9,7 +9,7 @@
  */
 
 #include "drill.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 ldns_rr *
 read_key_file(const char *filename)

diff --git a/drill/drill_util.h b/drill/drill_util.h
index 4e53b2f041cbb7767dac00a209fe707041f0e09a..db3a57436a4dde87301fdeb92ad005d1134c4046 100644 (file)
--- a/drill/drill_util.h
+++ b/drill/drill_util.h
@@ -10,7 +10,7 @@
 
 #ifndef _DRILL_UTIL_H_
 #define _DRILL_UTIL_H_
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 /**
  * return a address rdf, either A or AAAA 

diff --git a/drill/error.c b/drill/error.c
index 1981df07d79f0f9ccc15c81716998511f26831fd..6ead3898f9a6cdbde05ecfd963734e66885a5808 100644 (file)
--- a/drill/error.c
+++ b/drill/error.c
@@ -11,7 +11,7 @@
  */
 
 #include "drill.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 static void
 warning_va_list(const char *fmt, va_list args)

diff --git a/drill/root.c b/drill/root.c
index 8ce19128c88df18b810ebfb62eba53ad32065e87..c1ce1062229d6cbf5e470ac92c407499aacff7f7 100644 (file)
--- a/drill/root.c
+++ b/drill/root.c
@@ -9,7 +9,7 @@
  */
 
 #include "drill.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 /* a global list of the root-servers */
 ldns_rr_list *global_dns_root;

diff --git a/drill/securetrace.c b/drill/securetrace.c
index 55dc829b7d65b169fbc387443fb8e1723926ccbf..52ad6413f1ba88de1ad2cd4106de5e8bbed056e8 100644 (file)
--- a/drill/securetrace.c
+++ b/drill/securetrace.c
@@ -9,7 +9,7 @@
  */
 
 #include "drill.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #define SELF "[S]"  /* self sig ok */
 #define TRUST "[T]" /* chain from parent */

diff --git a/drill/work.c b/drill/work.c
index d295935c891bf2781043c0ccfef8c045708761b0..70824610f266ace58c5641ff945b5902d62afdaa 100644 (file)
--- a/drill/work.c
+++ b/drill/work.c
@@ -8,7 +8,7 @@
  */
 
 #include "drill.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 /**
  * Converts a hex string to binary data

diff --git a/error.c b/error.c
index bcc5f6fbb9024a483ad30b5b081ee652b777e16c..58da3cf3bf80af4e7e2f6fc2b444cef3475ad5e9 100644 (file)
--- a/error.c
+++ b/error.c
@@ -10,7 +10,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 ldns_lookup_table ldns_error_str[] = {
        { LDNS_STATUS_OK, "All OK" },

diff --git a/examples/configure.ac b/examples/configure.ac
index 38de87ea77a73a21aebcc1c3ea52f08d27b33d76..730f3151b52b1d5183d54188f3e19bf499e1fed3 100644 (file)
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -56,7 +56,7 @@ AC_CHECK_LIB(ldns, ldns_rr_new,, [
 
 AC_SUBST(LDNSDIR)
 
-AC_CHECK_HEADER(ldns/dns.h,,  [
+AC_CHECK_HEADER(ldns/ldns.h,,  [
        AC_MSG_ERROR([Can't find ldns headers])
        ], [AC_INCLUDES_DEFAULT]
 )

diff --git a/examples/ldns-chaos.c b/examples/ldns-chaos.c
index 705fb3801ce3972c51bbee3c3fb9c0f70d2d32ad..c28f63839ea735065ca5a3c13d940e4a43f249e3 100644 (file)
--- a/examples/ldns-chaos.c
+++ b/examples/ldns-chaos.c
@@ -9,7 +9,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 int
 usage(FILE *fp, char *prog) {

diff --git a/examples/ldns-dpa.c b/examples/ldns-dpa.c
index 7a7d3f70bd7ffbb40882cc13970860d3f2cab838..e2508526f5d05bc68dd462ebccffbe6fddee57ef 100644 (file)
--- a/examples/ldns-dpa.c
+++ b/examples/ldns-dpa.c
@@ -10,7 +10,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <netinet/ip6.h>
 #include <errno.h>

diff --git a/examples/ldns-ixfr.c b/examples/ldns-ixfr.c
index 0f573571381950721875adef4152dff524bea0ff..043901cae626b3e6df75f8edd7628c13206b3466 100644 (file)
--- a/examples/ldns-ixfr.c
+++ b/examples/ldns-ixfr.c
@@ -8,7 +8,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 int
 main(int argc, char *argv[])

diff --git a/examples/ldns-key2ds.c b/examples/ldns-key2ds.c
index b215e8a0053d464b953ddb34f8d8cc7508da1724..1e0d77fe890c91420d8fbf363bbf8a5cac4c7300 100644 (file)
--- a/examples/ldns-key2ds.c
+++ b/examples/ldns-key2ds.c
@@ -8,7 +8,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <errno.h>
 

diff --git a/examples/ldns-keyfetcher.c b/examples/ldns-keyfetcher.c
index b9cbf9df7e1867f6fdd77cc6883f5bfbbd18b2d3..b72acb80def0d0fe5553d748d4b1f22b5e4b9363 100644 (file)
--- a/examples/ldns-keyfetcher.c
+++ b/examples/ldns-keyfetcher.c
@@ -8,7 +8,7 @@
  */
 
 #include "config.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 #include <errno.h>
 
 int verbosity = 0;

diff --git a/examples/ldns-keygen.c b/examples/ldns-keygen.c
index d07a4d70eb1fa8e8b6674d99c4f17942d1900443..1c850d17d5a70a0822093523b99de95d3179a3e6 100644 (file)
--- a/examples/ldns-keygen.c
+++ b/examples/ldns-keygen.c
@@ -8,7 +8,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <errno.h>
 

diff --git a/examples/ldns-mx.c b/examples/ldns-mx.c
index 1ea168361f32237c5fcfa4ba27ca063024348332..6f63a2fb7c60b4aa41323bec22ad381b36457ab1 100644 (file)
--- a/examples/ldns-mx.c
+++ b/examples/ldns-mx.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 int
 usage(FILE *fp, char *prog) {

diff --git a/examples/ldns-notify.c b/examples/ldns-notify.c
index e96914f6f6b9eb52b61d35f552831936e04ba5a6..2382335563e79be0eedff6b049f55e5528bde6b1 100644 (file)
--- a/examples/ldns-notify.c
+++ b/examples/ldns-notify.c
@@ -7,7 +7,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 int
 main(int argc, char *argv[])

diff --git a/examples/ldns-read-zone.c b/examples/ldns-read-zone.c
index b9b9d046398ad88c76ee5e72d6223973883915f4..00f009e09eadeaf8017932fd95ebbb2d6756b4ea 100644 (file)
--- a/examples/ldns-read-zone.c
+++ b/examples/ldns-read-zone.c
@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <errno.h>
 

diff --git a/examples/ldns-resolver.c b/examples/ldns-resolver.c
index 6b7c763ba6f5a4b42b221c2eb045e4d970f0b348..6f40578d63af29ed448c0512bb18dcc11fbc21b8 100644 (file)
--- a/examples/ldns-resolver.c
+++ b/examples/ldns-resolver.c
@@ -9,7 +9,7 @@
 #include "config.h"
 #include "errno.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 int
 main(int argc, char **argv) {

diff --git a/examples/ldns-rrsig.c b/examples/ldns-rrsig.c
index 3cfd47bf102f9104958a8102c00882b03c831831..0993adee7594f9c61764035cee5a811e138cc9f5 100644 (file)
--- a/examples/ldns-rrsig.c
+++ b/examples/ldns-rrsig.c
@@ -9,7 +9,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 int
 usage(FILE *fp, char *prog) {

diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c
index 04b9687b3bac5a229a86c081955e2ed0a1937f57..9b4b1e406fecd17d91dc441409f621883fbd1330 100644 (file)
--- a/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@ -13,7 +13,7 @@
 
 #include <time.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #define MAX_FILENAME_LEN 250
 

diff --git a/examples/ldns-update.c b/examples/ldns-update.c
index 7a96fb29c07b8e0835364295149ba0a8ade5dc10..2ebdcecd17955edbbabae9c9eba53600bb9f80ba 100644 (file)
--- a/examples/ldns-update.c
+++ b/examples/ldns-update.c
@@ -9,7 +9,7 @@
 #include "config.h"
 
 #include <strings.h>
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 /* dynamic update stuff */
 ldns_resolver *

diff --git a/examples/ldns-version.c b/examples/ldns-version.c
index 43255a53ef5013a8c9f152b94e0971fc6501f572..e74e393d8fc61461e08a0baaac802a74702ea95f 100644 (file)
--- a/examples/ldns-version.c
+++ b/examples/ldns-version.c
@@ -6,7 +6,7 @@
  */
 
 #include "config.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 int
 main(void)

diff --git a/examples/ldns-walk.c b/examples/ldns-walk.c
index aaac3caec119ef7ca7b4467c6eb6c0efeafec47e..9911b08de990da03c4bcd06edea954e930bab1f7 100644 (file)
--- a/examples/ldns-walk.c
+++ b/examples/ldns-walk.c
@@ -8,7 +8,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 int verbosity = 0;
 

diff --git a/examples/ldns-zcat.c b/examples/ldns-zcat.c
index a8e1d6811539af367f2241089f0107043ac64836..6957d03bc829d91e798866f1407dd1a5729e5569 100644 (file)
--- a/examples/ldns-zcat.c
+++ b/examples/ldns-zcat.c
@@ -16,7 +16,7 @@
 
 #include "config.h"
 #include <errno.h>
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #define FIRST_ZONE     0
 #define MIDDLE_ZONE    1

diff --git a/examples/ldns-zsplit.c b/examples/ldns-zsplit.c
index e2570c329e4f921c550c79d1d28e1983eefd5b0a..2c54a8b9252c3bee3cbf041df42924093ef9e326 100644 (file)
--- a/examples/ldns-zsplit.c
+++ b/examples/ldns-zsplit.c
@@ -16,7 +16,7 @@
 
 #include "config.h"
 #include <errno.h>
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #define DEFAULT_SPLIT  1000
 #define FILE_SIZE      255

diff --git a/examples/ldnsd.c b/examples/ldnsd.c
index a4fb0a11e2e1754611b91964c0d6c7a61b05c7eb..4a03a0b4235d5f85986eb3309d05bff5371f5bcb 100644 (file)
--- a/examples/ldnsd.c
+++ b/examples/ldnsd.c
@@ -8,7 +8,7 @@
  */
 
 #include "config.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/examples/nsd-test/configure.ac b/examples/nsd-test/configure.ac
index 1d606ec4d93da7194c855040bc8c340b1bd62169..d15d7c3e4384c2a315b14cd5a4e2fe06b230cbcc 100644 (file)
--- a/examples/nsd-test/configure.ac
+++ b/examples/nsd-test/configure.ac
@@ -56,7 +56,7 @@ AC_CHECK_LIB(ldns, ldns_rr_new,, [
 
 AC_SUBST(LDNSDIR)
 
-AC_CHECK_HEADER(ldns/dns.h,,  [
+AC_CHECK_HEADER(ldns/ldns.h,,  [
        AC_MSG_ERROR([Can't find ldns headers])
        ], [AC_INCLUDES_DEFAULT]
 )

diff --git a/examples/nsd-test/nsd-ldnsd.c b/examples/nsd-test/nsd-ldnsd.c
index cb10ccd10b059b4b16198460877fdb06618ee3a6..1bc4dba7a807025d758459193c95ff0c0df8beff 100644 (file)
--- a/examples/nsd-test/nsd-ldnsd.c
+++ b/examples/nsd-test/nsd-ldnsd.c
@@ -9,7 +9,7 @@
  */
 
 #include "config.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/higher.c b/higher.c
index 63c3520706959f3eecdbbd9178f17c38cad5bc1a..4119a4ddd55de6a6f438467de1a8e847deb8465d 100644 (file)
--- a/higher.c
+++ b/higher.c
@@ -13,7 +13,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <openssl/ssl.h>
 #include <openssl/sha.h>

diff --git a/host2str.c b/host2str.c
index 82dc218b19f7d155abca5e26629a9c6b6c9c619a..3ce6c67b89c0c624b04da19aaac6d2c13a6c5db2 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -12,7 +12,7 @@
  */
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <limits.h>
 

diff --git a/host2wire.c b/host2wire.c
index 1b245babd7f4ae80a7455c69ba78928739e1b606..0e66daf29cc4c0b3ea82193271b711ed24f246d9 100644 (file)
--- a/host2wire.c
+++ b/host2wire.c
@@ -14,7 +14,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 /* TODO Jelte
   add a pointer to a 'possiblecompression' structure

diff --git a/keys.c b/keys.c
index a26afb86c9c8bcfe7291abec48a81f9ebd93fe13..dac37a21f9ddb58dc7eaaf37a4545cd87d65a639 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -12,7 +12,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #ifdef HAVE_SSL
 #include <openssl/ssl.h>

diff --git a/ldns/dns.h b/ldns/ldns.h
similarity index 99%
rename from ldns/dns.h
rename to ldns/ldns.h
index de82a31162638b0b7cc21d5fcfa63ee0e0197186..b1f7bd0adbad34673f15c16d13871ce433772809 100644 (file)
--- a/ldns/dns.h
+++ b/ldns/ldns.h
@@ -81,7 +81,7 @@ Or you can just use the menu above to browse through the API docs.
 */
 
 /**
- * \file dns.h
+ * \file ldns.h
  *
  * Including this file will include all ldns files, and define some lookup tables.
  */

diff --git a/libdns.vim b/libdns.vim
index 1f9f778c6bd407b872bdf8a15e65a3b8691ec638..69ec067150dd76c2c42cfec145d9b608a51b65cd 100644 (file)
--- a/libdns.vim
+++ b/libdns.vim
@@ -60,7 +60,7 @@ syn keyword  ldnsConstant       LDNS_RDF_SIZE_DOUBLEWORD
 syn keyword  ldnsConstant       LDNS_RDF_SIZE_6BYTES           
 syn keyword  ldnsConstant       LDNS_RDF_SIZE_16BYTES          
 
-" ldns/dns.h
+" ldns/ldns.h
 syn keyword  ldnsConstant      LDNS_PORT
 syn keyword  ldnsConstant      LDNS_IP4ADDRLEN
 syn keyword  ldnsConstant      LDNS_IP6ADDRLEN

diff --git a/linktest.c b/linktest.c
index 85b61caa06965567d2b73612eb4194dec7af3da0..c21753a53f760c27bc93ebad48e795112e44c65e 100644 (file)
--- a/linktest.c
+++ b/linktest.c
@@ -1,6 +1,6 @@
 
 #include "ldns/config.h"
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 int 
 main(void) 

diff --git a/lua/configure.ac b/lua/configure.ac
index 45bf5f719e3230bc4ce025e0e658f2ed46e9312d..dc00643dc2dd0994e8559d5c8ba15221b09657a2 100644 (file)
--- a/lua/configure.ac
+++ b/lua/configure.ac
@@ -30,16 +30,16 @@ AC_CHECK_HEADERS(sys/param.h sys/mount.h,,,
 
 # check for ldns
 AC_ARG_WITH(ldns, AC_HELP_STRING([--with-ldns=pathname],[]))
-AC_MSG_CHECKING(for ldns/dns.h)
+AC_MSG_CHECKING(for ldns/ldns.h)
 for dir in $withval /usr/local/ldns /usr/lib/ldns /usr/ldns /usr/pkg /usr/local /usr; do
 ldnsdir="$dir"
-if test -f "$dir/include/ldns/dns.h"; then
+if test -f "$dir/include/ldns/ldns.h"; then
     found_ldns="yes";
     CFLAGS="$CFLAGS -I$ldnsdir/include/ -DHAVE_LDNS";
     CXXFLAGS="$CXXFLAGS -I$ldnsdir/include/ -DHAVE_LDNS";
     break;
 fi
-if test -f "$dir/ldns/dns.h"; then
+if test -f "$dir/ldns/ldns.h"; then
     found_ldns="yes";
     CFLAGS="$CFLAGS -I$ldnsdir/ -DHAVE_LDNS";
     CXXFLAGS="$CXXFLAGS -I$ldnsdir/ -DHAVE_LDNS";

diff --git a/lua/lua.c b/lua/lua.c
index e12fbdea02bf10abe6c82782566d815d62a53c99..466da3741714229874dcd2eadd4ac194cd3fb39e 100644 (file)
--- a/lua/lua.c
+++ b/lua/lua.c
@@ -18,7 +18,7 @@
 #include <lauxlib.h>
 
 /* ldns include */
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 /* the Lua interpreter */
 lua_State* L;

diff --git a/net.c b/net.c
index 2aab5866d80b1749082119d2b3945141fe3e8cf0..09773bd8b603b19d11af90958fba6862f13bacf3 100644 (file)
--- a/net.c
+++ b/net.c
@@ -13,7 +13,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <netinet/in.h>
 #include <sys/socket.h>

diff --git a/packet.c b/packet.c
index 06cff1f6b968768145e736381f265c29027b6d96..06ee7ab5afd59c71240809bbd7cc40f49a1c1688 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -12,7 +12,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <strings.h>
 #include <limits.h>

diff --git a/parse.c b/parse.c
index a06788e1d341c71084e8e08afaf70e8b50f82385..8093b37853d7000594a7880b631db6b96f3ad111 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -8,7 +8,7 @@
  * See the file LICENSE for the license
  */
 #include <ldns/config.h>
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <limits.h>
 #include <strings.h>

diff --git a/pcat/configure.ac b/pcat/configure.ac
index 72acc398d97422332558eaaad9465568cf8d2370..b08d012414d24323aa0ae0ae73d05d57cf590630 100644 (file)
--- a/pcat/configure.ac
+++ b/pcat/configure.ac
@@ -53,7 +53,7 @@ AC_CHECK_LIB(ldns, ldns_rr_new,, [
        ]
 )
 
-AC_CHECK_HEADER(ldns/dns.h,,  [
+AC_CHECK_HEADER(ldns/ldns.h,,  [
        AC_MSG_ERROR([Can't find ldns headers])
        ], [AC_INCLUDES_DEFAULT]
 )

diff --git a/pcat/pcat-diff.c b/pcat/pcat-diff.c
index 94acd21139598264ea68c55c4a93ecbb520ede3f..7e3782e4f086423e57fb148cbaa404da48e943cb 100644 (file)
--- a/pcat/pcat-diff.c
+++ b/pcat/pcat-diff.c
@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 #include <pcap.h>
 
 #define SEQUENCE 1

diff --git a/pcat/pcat-print.c b/pcat/pcat-print.c
index 8e62b4fc3f0559e998f9d7d9b6297fb24ed1b939..12c8ac4731254e9217478465356fa5e19ad24c1c 100644 (file)
--- a/pcat/pcat-print.c
+++ b/pcat/pcat-print.c
@@ -2,7 +2,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #define SEQUENCE 1
 #define QUERY    2

diff --git a/pcat/pcat.c b/pcat/pcat.c
index d4307d83cad64c72e8c1e7b0f7c540fba5125f2b..f0152c6de9c4bd7d8eb2a758aed3280116af3cbc 100644 (file)
--- a/pcat/pcat.c
+++ b/pcat/pcat.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 #include <pcap.h>
 
 #define FAILURE 100

diff --git a/rdata.c b/rdata.c
index 3d9733a3e47888ed4879a14291b950e32f2acccf..4a3bac7b60a9f62ec26722763e5da6fb6c8243d2 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -12,7 +12,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 /*
  * Access functions 

diff --git a/resolver.c b/resolver.c
index f11af3e9d78fea1f6923f0723218826d314957ea..de6128313d809df26ae4a6736a549b85285c7958 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -12,7 +12,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 #include <strings.h>
 
 /* Access function for reading 

diff --git a/rr.c b/rr.c
index 20d47208bef9b42fee03e2fc9428e8527a0a4017..bd45ea652be322a201b7d440b893ee42c7f04e2a 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -9,7 +9,7 @@
  */
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <strings.h>
 #include <limits.h>

diff --git a/rr_functions.c b/rr_functions.c
index 8dba19c199ee67cc9ba4cfbcb3c1c1676c0163a3..2b3e8e27ecd83c34192fb9bf87ba5ec192ecaf90 100644 (file)
--- a/rr_functions.c
+++ b/rr_functions.c
@@ -15,7 +15,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <limits.h>
 #include <strings.h>

diff --git a/str2host.c b/str2host.c
index 60fd47dfb9a1358a3123464806f9a9501de174fe..92d5f27413219cd3ea45b5d5a4fc1b9e43e11ebe 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -12,7 +12,7 @@
  */
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/test/12.unit-tests-dnssec.tpkg b/test/12.unit-tests-dnssec.tpkg
index 97a1a10b267f5934e95cca120882d3e1b865e9ab..5cb0823d1cdca1fcd7059035a78fc6dc0cb1ed84 100644 (file)
Binary files a/test/12.unit-tests-dnssec.tpkg and b/test/12.unit-tests-dnssec.tpkg differ

diff --git a/tsig.c b/tsig.c
index eb8405b5739fdf3a634d98fba66b44f97642fdf6..6ecf3a5b5dbd18d2e4197978812a3e2ce8676d95 100644 (file)
--- a/tsig.c
+++ b/tsig.c
@@ -9,7 +9,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <strings.h>
 

diff --git a/update.c b/update.c
index e5a9e82b41aff1e15ec989b14fb0341ecb1ca841..110fbc78ae7a052a2cab841d0b25f96b0a44932d 100644 (file)
--- a/update.c
+++ b/update.c
@@ -9,7 +9,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <strings.h>
 #include <stdlib.h>

diff --git a/wire2host.c b/wire2host.c
index bdbe85f53047f5dcf7485c3c1378456834657de6..f164d4a820f1c380513cd895850d28f5c8564a9e 100644 (file)
--- a/wire2host.c
+++ b/wire2host.c
@@ -16,7 +16,7 @@
 
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 /*#include <ldns/wire2host.h>*/
 
 #include <strings.h>

diff --git a/zone.c b/zone.c
index 8b471ea5dccf79e35f43d88eabff5e599c9c2e2e..7bbbb58451e3d6859fec0efed4e337bfb9bdea08 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -8,7 +8,7 @@
  */
 #include <ldns/config.h>
 
-#include <ldns/dns.h>
+#include <ldns/ldns.h>
 
 #include <strings.h>
 #include <limits.h>