From: Jelte Jansen Date: Tue, 4 Jul 2006 12:50:41 +0000 (+0000) Subject: ldns/dns.h -> ldns/ldns.h X-Git-Tag: release-1.1.0~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03efb32e10202eb46641ca9f92753cdbed806ba3;p=thirdparty%2Fldns.git ldns/dns.h -> ldns/ldns.h --- diff --git a/Makefile.in b/Makefile.in index d11a2204..1befa661 100644 --- 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 3e70262f..9aacf8bf 100644 --- a/buffer.c +++ b/buffer.c @@ -9,7 +9,7 @@ #include -#include +#include #include ldns_buffer * diff --git a/compat/b64_ntop.c b/compat/b64_ntop.c index b2ff41b9..56eb680a 100644 --- a/compat/b64_ntop.c +++ b/compat/b64_ntop.c @@ -41,7 +41,7 @@ */ #include -#include +#include #include #include diff --git a/compat/b64_pton.c b/compat/b64_pton.c index d705ece0..26e49f74 100644 --- a/compat/b64_pton.c +++ b/compat/b64_pton.c @@ -41,7 +41,7 @@ */ #include -#include +#include #include #include diff --git a/dname.c b/dname.c index e4bf15e8..39833a4a 100644 --- a/dname.c +++ b/dname.c @@ -15,7 +15,7 @@ #include -#include +#include #include #include diff --git a/dnssec.c b/dnssec.c index 157e1b36..bc7c5d2e 100644 --- a/dnssec.c +++ b/dnssec.c @@ -12,7 +12,7 @@ #include -#include +#include #include #include diff --git a/drill/chasetrace.c b/drill/chasetrace.c index b70bc15d..c7553580 100644 --- a/drill/chasetrace.c +++ b/drill/chasetrace.c @@ -9,7 +9,7 @@ */ #include "drill.h" -#include +#include /** * trace down from the root to name diff --git a/drill/configure.ac b/drill/configure.ac index bfd0bb50..f1c2db32 100644 --- 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 ee615cab..d9b90a6c 100644 --- a/drill/dnssec.c +++ b/drill/dnssec.c @@ -9,7 +9,7 @@ */ #include "drill.h" -#include +#include /* get rr_type from a server from a server */ ldns_rr_list * diff --git a/drill/drill.c b/drill/drill.c index 77525534..6d9b7a7b 100644 --- a/drill/drill.c +++ b/drill/drill.c @@ -8,7 +8,7 @@ */ #include "drill.h" -#include +#include #define IP6_ARPA_MAX_LEN 65 diff --git a/drill/drill_util.c b/drill/drill_util.c index 1289fb2e..54840e93 100644 --- a/drill/drill_util.c +++ b/drill/drill_util.c @@ -9,7 +9,7 @@ */ #include "drill.h" -#include +#include ldns_rr * read_key_file(const char *filename) diff --git a/drill/drill_util.h b/drill/drill_util.h index 4e53b2f0..db3a5743 100644 --- a/drill/drill_util.h +++ b/drill/drill_util.h @@ -10,7 +10,7 @@ #ifndef _DRILL_UTIL_H_ #define _DRILL_UTIL_H_ -#include +#include /** * return a address rdf, either A or AAAA diff --git a/drill/error.c b/drill/error.c index 1981df07..6ead3898 100644 --- a/drill/error.c +++ b/drill/error.c @@ -11,7 +11,7 @@ */ #include "drill.h" -#include +#include static void warning_va_list(const char *fmt, va_list args) diff --git a/drill/root.c b/drill/root.c index 8ce19128..c1ce1062 100644 --- a/drill/root.c +++ b/drill/root.c @@ -9,7 +9,7 @@ */ #include "drill.h" -#include +#include /* a global list of the root-servers */ ldns_rr_list *global_dns_root; diff --git a/drill/securetrace.c b/drill/securetrace.c index 55dc829b..52ad6413 100644 --- a/drill/securetrace.c +++ b/drill/securetrace.c @@ -9,7 +9,7 @@ */ #include "drill.h" -#include +#include #define SELF "[S]" /* self sig ok */ #define TRUST "[T]" /* chain from parent */ diff --git a/drill/work.c b/drill/work.c index d295935c..70824610 100644 --- a/drill/work.c +++ b/drill/work.c @@ -8,7 +8,7 @@ */ #include "drill.h" -#include +#include /** * Converts a hex string to binary data diff --git a/error.c b/error.c index bcc5f6fb..58da3cf3 100644 --- a/error.c +++ b/error.c @@ -10,7 +10,7 @@ #include -#include +#include ldns_lookup_table ldns_error_str[] = { { LDNS_STATUS_OK, "All OK" }, diff --git a/examples/configure.ac b/examples/configure.ac index 38de87ea..730f3151 100644 --- 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 705fb380..c28f6383 100644 --- a/examples/ldns-chaos.c +++ b/examples/ldns-chaos.c @@ -9,7 +9,7 @@ #include "config.h" -#include +#include int usage(FILE *fp, char *prog) { diff --git a/examples/ldns-dpa.c b/examples/ldns-dpa.c index 7a7d3f70..e2508526 100644 --- a/examples/ldns-dpa.c +++ b/examples/ldns-dpa.c @@ -10,7 +10,7 @@ #include "config.h" -#include +#include #include #include diff --git a/examples/ldns-ixfr.c b/examples/ldns-ixfr.c index 0f573571..043901ca 100644 --- a/examples/ldns-ixfr.c +++ b/examples/ldns-ixfr.c @@ -8,7 +8,7 @@ #include "config.h" -#include +#include int main(int argc, char *argv[]) diff --git a/examples/ldns-key2ds.c b/examples/ldns-key2ds.c index b215e8a0..1e0d77fe 100644 --- a/examples/ldns-key2ds.c +++ b/examples/ldns-key2ds.c @@ -8,7 +8,7 @@ #include "config.h" -#include +#include #include diff --git a/examples/ldns-keyfetcher.c b/examples/ldns-keyfetcher.c index b9cbf9df..b72acb80 100644 --- a/examples/ldns-keyfetcher.c +++ b/examples/ldns-keyfetcher.c @@ -8,7 +8,7 @@ */ #include "config.h" -#include +#include #include int verbosity = 0; diff --git a/examples/ldns-keygen.c b/examples/ldns-keygen.c index d07a4d70..1c850d17 100644 --- a/examples/ldns-keygen.c +++ b/examples/ldns-keygen.c @@ -8,7 +8,7 @@ #include "config.h" -#include +#include #include diff --git a/examples/ldns-mx.c b/examples/ldns-mx.c index 1ea16836..6f63a2fb 100644 --- a/examples/ldns-mx.c +++ b/examples/ldns-mx.c @@ -9,7 +9,7 @@ #include #include -#include +#include int usage(FILE *fp, char *prog) { diff --git a/examples/ldns-notify.c b/examples/ldns-notify.c index e96914f6..23823355 100644 --- a/examples/ldns-notify.c +++ b/examples/ldns-notify.c @@ -7,7 +7,7 @@ #include "config.h" -#include +#include int main(int argc, char *argv[]) diff --git a/examples/ldns-read-zone.c b/examples/ldns-read-zone.c index b9b9d046..00f009e0 100644 --- a/examples/ldns-read-zone.c +++ b/examples/ldns-read-zone.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/examples/ldns-resolver.c b/examples/ldns-resolver.c index 6b7c763b..6f40578d 100644 --- a/examples/ldns-resolver.c +++ b/examples/ldns-resolver.c @@ -9,7 +9,7 @@ #include "config.h" #include "errno.h" -#include +#include int main(int argc, char **argv) { diff --git a/examples/ldns-rrsig.c b/examples/ldns-rrsig.c index 3cfd47bf..0993adee 100644 --- a/examples/ldns-rrsig.c +++ b/examples/ldns-rrsig.c @@ -9,7 +9,7 @@ #include "config.h" -#include +#include int usage(FILE *fp, char *prog) { diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c index 04b9687b..9b4b1e40 100644 --- a/examples/ldns-signzone.c +++ b/examples/ldns-signzone.c @@ -13,7 +13,7 @@ #include -#include +#include #define MAX_FILENAME_LEN 250 diff --git a/examples/ldns-update.c b/examples/ldns-update.c index 7a96fb29..2ebdcecd 100644 --- a/examples/ldns-update.c +++ b/examples/ldns-update.c @@ -9,7 +9,7 @@ #include "config.h" #include -#include +#include /* dynamic update stuff */ ldns_resolver * diff --git a/examples/ldns-version.c b/examples/ldns-version.c index 43255a53..e74e393d 100644 --- a/examples/ldns-version.c +++ b/examples/ldns-version.c @@ -6,7 +6,7 @@ */ #include "config.h" -#include +#include int main(void) diff --git a/examples/ldns-walk.c b/examples/ldns-walk.c index aaac3cae..9911b08d 100644 --- a/examples/ldns-walk.c +++ b/examples/ldns-walk.c @@ -8,7 +8,7 @@ #include "config.h" -#include +#include int verbosity = 0; diff --git a/examples/ldns-zcat.c b/examples/ldns-zcat.c index a8e1d681..6957d03b 100644 --- a/examples/ldns-zcat.c +++ b/examples/ldns-zcat.c @@ -16,7 +16,7 @@ #include "config.h" #include -#include +#include #define FIRST_ZONE 0 #define MIDDLE_ZONE 1 diff --git a/examples/ldns-zsplit.c b/examples/ldns-zsplit.c index e2570c32..2c54a8b9 100644 --- a/examples/ldns-zsplit.c +++ b/examples/ldns-zsplit.c @@ -16,7 +16,7 @@ #include "config.h" #include -#include +#include #define DEFAULT_SPLIT 1000 #define FILE_SIZE 255 diff --git a/examples/ldnsd.c b/examples/ldnsd.c index a4fb0a11..4a03a0b4 100644 --- a/examples/ldnsd.c +++ b/examples/ldnsd.c @@ -8,7 +8,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/examples/nsd-test/configure.ac b/examples/nsd-test/configure.ac index 1d606ec4..d15d7c3e 100644 --- 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 cb10ccd1..1bc4dba7 100644 --- a/examples/nsd-test/nsd-ldnsd.c +++ b/examples/nsd-test/nsd-ldnsd.c @@ -9,7 +9,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/higher.c b/higher.c index 63c35207..4119a4dd 100644 --- a/higher.c +++ b/higher.c @@ -13,7 +13,7 @@ #include -#include +#include #include #include diff --git a/host2str.c b/host2str.c index 82dc218b..3ce6c67b 100644 --- a/host2str.c +++ b/host2str.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include diff --git a/host2wire.c b/host2wire.c index 1b245bab..0e66daf2 100644 --- a/host2wire.c +++ b/host2wire.c @@ -14,7 +14,7 @@ #include -#include +#include /* TODO Jelte add a pointer to a 'possiblecompression' structure diff --git a/keys.c b/keys.c index a26afb86..dac37a21 100644 --- a/keys.c +++ b/keys.c @@ -12,7 +12,7 @@ #include -#include +#include #ifdef HAVE_SSL #include diff --git a/ldns/dns.h b/ldns/ldns.h similarity index 99% rename from ldns/dns.h rename to ldns/ldns.h index de82a311..b1f7bd0a 100644 --- 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 1f9f778c..69ec0671 100644 --- 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 85b61caa..c21753a5 100644 --- a/linktest.c +++ b/linktest.c @@ -1,6 +1,6 @@ #include "ldns/config.h" -#include +#include int main(void) diff --git a/lua/configure.ac b/lua/configure.ac index 45bf5f71..dc00643d 100644 --- 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 e12fbdea..466da374 100644 --- a/lua/lua.c +++ b/lua/lua.c @@ -18,7 +18,7 @@ #include /* ldns include */ -#include +#include /* the Lua interpreter */ lua_State* L; diff --git a/net.c b/net.c index 2aab5866..09773bd8 100644 --- a/net.c +++ b/net.c @@ -13,7 +13,7 @@ #include -#include +#include #include #include diff --git a/packet.c b/packet.c index 06cff1f6..06ee7ab5 100644 --- a/packet.c +++ b/packet.c @@ -12,7 +12,7 @@ #include -#include +#include #include #include diff --git a/parse.c b/parse.c index a06788e1..8093b378 100644 --- a/parse.c +++ b/parse.c @@ -8,7 +8,7 @@ * See the file LICENSE for the license */ #include -#include +#include #include #include diff --git a/pcat/configure.ac b/pcat/configure.ac index 72acc398..b08d0124 100644 --- 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 94acd211..7e3782e4 100644 --- a/pcat/pcat-diff.c +++ b/pcat/pcat-diff.c @@ -1,7 +1,7 @@ #define _GNU_SOURCE #include "config.h" -#include +#include #include #define SEQUENCE 1 diff --git a/pcat/pcat-print.c b/pcat/pcat-print.c index 8e62b4fc..12c8ac47 100644 --- a/pcat/pcat-print.c +++ b/pcat/pcat-print.c @@ -2,7 +2,7 @@ #include "config.h" -#include +#include #define SEQUENCE 1 #define QUERY 2 diff --git a/pcat/pcat.c b/pcat/pcat.c index d4307d83..f0152c6d 100644 --- a/pcat/pcat.c +++ b/pcat/pcat.c @@ -4,7 +4,7 @@ #include "config.h" -#include +#include #include #define FAILURE 100 diff --git a/rdata.c b/rdata.c index 3d9733a3..4a3bac7b 100644 --- a/rdata.c +++ b/rdata.c @@ -12,7 +12,7 @@ #include -#include +#include /* * Access functions diff --git a/resolver.c b/resolver.c index f11af3e9..de612831 100644 --- a/resolver.c +++ b/resolver.c @@ -12,7 +12,7 @@ #include -#include +#include #include /* Access function for reading diff --git a/rr.c b/rr.c index 20d47208..bd45ea65 100644 --- a/rr.c +++ b/rr.c @@ -9,7 +9,7 @@ */ #include -#include +#include #include #include diff --git a/rr_functions.c b/rr_functions.c index 8dba19c1..2b3e8e27 100644 --- a/rr_functions.c +++ b/rr_functions.c @@ -15,7 +15,7 @@ #include -#include +#include #include #include diff --git a/str2host.c b/str2host.c index 60fd47df..92d5f274 100644 --- a/str2host.c +++ b/str2host.c @@ -12,7 +12,7 @@ */ #include -#include +#include #include #include diff --git a/test/12.unit-tests-dnssec.tpkg b/test/12.unit-tests-dnssec.tpkg index 97a1a10b..5cb0823d 100644 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 eb8405b5..6ecf3a5b 100644 --- a/tsig.c +++ b/tsig.c @@ -9,7 +9,7 @@ #include -#include +#include #include diff --git a/update.c b/update.c index e5a9e82b..110fbc78 100644 --- a/update.c +++ b/update.c @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/wire2host.c b/wire2host.c index bdbe85f5..f164d4a8 100644 --- a/wire2host.c +++ b/wire2host.c @@ -16,7 +16,7 @@ #include -#include +#include /*#include */ #include diff --git a/zone.c b/zone.c index 8b471ea5..7bbbb584 100644 --- a/zone.c +++ b/zone.c @@ -8,7 +8,7 @@ */ #include -#include +#include #include #include