Fix typo in changelog entry for 1.6.1

diff --git a/INSTALL b/INSTALL
index c360d8908778332ec75b26d9c2b106a0d5052a29..1b99d036053b2779859fa91a3c5f85a9accd1db2 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -101,7 +101,8 @@ This file, INSTALL, contains installation instructions and other
 details for adns.
 
 adns is
 details for adns.
 
 adns is

- Copyright (C) 1997-2000,2003,2006,2014-2016,2020 Ian Jackson
+ Copyright (C) 1997-2000,2003,2006,2014-2016,2020,2024 Ian Jackson
+ Copyright (C) 2024 Sergey Poznyakoff

  Copyright (C) 2014 Mark Wooding
  Copyright (C) 1999-2000,2003,2006 Tony Finch <dot@dotat.at>         [1]
  Copyright (C) 1991 Massachusetts Institute of Technology            [2]
  Copyright (C) 2014 Mark Wooding
  Copyright (C) 1999-2000,2003,2006 Tony Finch <dot@dotat.at>         [1]
  Copyright (C) 1991 Massachusetts Institute of Technology            [2]

diff --git a/Makefile.in b/Makefile.in
index 0889ad9d3815b6c5b1c9c081c315bfb434ed4197..bc1a0b2bd1a321ce58984aabddd27a4362f848c9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,11 +1,7 @@
 # Makefile[.in] - top-level Makefile
 #  
 # Makefile[.in] - top-level Makefile
 #  

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 # 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 # 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by


@@ -24,7 +20,7 @@ include               ./common.make
 
 # Remember to change ADNS_VERSION_STRING in client/client.h too, and
 # possibly library soname (MAJOR and MINOR in common.make.in).
 
 # Remember to change ADNS_VERSION_STRING in client/client.h too, and
 # possibly library soname (MAJOR and MINOR in common.make.in).

-DISTVERSION=   1.5.2
+DISTVERSION=   1.6.1

 
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 
 srcdir=                @srcdir@
 VPATH=         @srcdir@


@@ -75,10 +71,10 @@ adnshost.txt: all
 
 web-install: adnshost.txt
        test -e $(WEBDIR) || mkdir $(WEBDIR)
 
 web-install: adnshost.txt
        test -e $(WEBDIR) || mkdir $(WEBDIR)

-       $(INSTALL_DATA) $(srcdir)/README.html $(WEBDIR)/
-       $(INSTALL_DATA) $(srcdir)/src/adns.h $(WEBDIR)/adns.h.txt
-       $(INSTALL_DATA) COPYING $(WEBDIR)/COPYING.txt
-       $(INSTALL_DATA) adnshost.txt $(WEBDIR)/
+       $(INSTALL_DATA) $(srcdir)/README.html $(DESTDIR)$(WEBDIR)/
+       $(INSTALL_DATA) $(srcdir)/src/adns.h $(DESTDIR)$(WEBDIR)/adns.h.txt
+       $(INSTALL_DATA) COPYING $(DESTDIR)$(WEBDIR)/COPYING.txt
+       $(INSTALL_DATA) adnshost.txt $(DESTDIR)$(WEBDIR)/

 
 check:                 all
        $(MAKE) -C regress check
 
 check:                 all
        $(MAKE) -C regress check

diff --git a/README b/README
index 26450aadc3cd938ac336c70a7ee20a4280573669..da6108ac835ed1af4b7d3339d0e592073b3cd3d6 100644 (file)
--- a/README
+++ b/README
@@ -120,9 +120,8 @@ References and related projects
 
 Copyright and licensing
 
 
 Copyright and licensing
 

-   adns is Copyright 1997-2000,2003,2006,2014-2016,2020 Ian Jackson,
-   Copyright 2014 Mark Wooding, Copyright 1999-2000,2003,2006 Tony Finch,
-   and Copyright 1991 Massachusetts Institute of Technology.
+   adns is Copyright Ian Jackson and contributors. (See the file INSTALL
+   for a full list.)

 
    adns is free software; you can redistribute it and/or modify it under
    the terms of the GNU General Public License as published by the Free
 
    adns is free software; you can redistribute it and/or modify it under
    the terms of the GNU General Public License as published by the Free


@@ -148,23 +147,23 @@ Copyright and licensing
 
 References
 
 
 References
 

-   1. http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt
-   2. http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt
-   3. http://debbugs.gnu.org/
-   4. http://www.chiark.greenend.org.uk/mailman/listinfo
-   5. http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt
-   6. http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt
-   7. http://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz
-   8. http://www.chiark.greenend.org.uk/~ian/adns/ftp/
-   9. http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/
-  10. http://www.gnu.org/
-  11. http://www.gnu.org/order/ftp.html
-  12. http://code.google.com/p/adns-python
-  13. http://www.lysator.liu.se/liboop/
-  14. http://adns.jgaa.com/
-  15. http://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt
-  16. http://www.fsf.org/
-  17. http://www.gnu.org/
-  18. http://www.chiark.greenend.org.uk/
+   1. https://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt
+   2. https://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt
+   3. https://debbugs.gnu.org/
+   4. https://www.chiark.greenend.org.uk/mailman/listinfo
+   5. https://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt
+   6. https://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt
+   7. https://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz
+   8. https://www.chiark.greenend.org.uk/~ian/adns/ftp/
+   9. https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/
+  10. https://www.gnu.org/
+  11. https://www.gnu.org/order/ftp.html
+  12. https://code.google.com/p/adns-python
+  13. https://www.lysator.liu.se/liboop/
+  14. https://adns.jgaa.com/
+  15. https://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt
+  16. https://www.fsf.org/
+  17. https://www.gnu.org/
+  18. https://www.chiark.greenend.org.uk/

   19. file:///
   19. file:///

-  20. http://www.chiark.greenend.org.uk/~ian/sw-www-copy.html
+  20. https://www.chiark.greenend.org.uk/~ian/sw-www-copy.html

diff --git a/README.html b/README.html
index d2048f1afdf4215a22d2bbeaefd24e78830d2168..f0d4560f719afa5d6e6778129cf9e60d51059437 100644 (file)
--- a/README.html
+++ b/README.html
@@ -11,7 +11,7 @@ library and utilities.</strong>
 <!--      Note: this file must contain portable HTML !            -->
 <!--                                                              -->
 <!--  It is served on the GNU site and also from my own system,   -->
 <!--      Note: this file must contain portable HTML !            -->
 <!--                                                              -->
 <!--  It is served on the GNU site and also from my own system,   -->

-<!--  under the URL http://www.chiark.greenend.org.uk/adns/       -->
+<!--  under the URL https://www.chiark.greenend.org.uk/adns/       -->

 <!--  Please ensure that all links continine to be correct        -->
 <!--  both for www.gnu.org and chiark.                            -->
 <!--                                                              -->
 <!--  Please ensure that all links continine to be correct        -->
 <!--  both for www.gnu.org and chiark.                            -->
 <!--                                                              -->


@@ -87,7 +87,7 @@ which can be used easily in from the command line and from shell
 scripts to do simple lookups.  In a more advanced mode it can be used
 as a general-purpose DNS helper program for scripting languages which
 can invoke and communicate with subprocesses.  See the
 scripts to do simple lookups.  In a more advanced mode it can be used
 as a general-purpose DNS helper program for scripting languages which
 can invoke and communicate with subprocesses.  See the

-<A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">adnshost
+<A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">adnshost

 usage message</A> for a summary of its capabilities.
 
 </ul>
 usage message</A> for a summary of its capabilities.
 
 </ul>


@@ -96,7 +96,7 @@ usage message</A> for a summary of its capabilities.
 
 I'm afraid there is no manual yet.  However, competent C programmers
 should be able to use the library based on the
 
 I'm afraid there is no manual yet.  However, competent C programmers
 should be able to use the library based on the

-<A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">commented
+<A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">commented

 adns.h header file</A>, and the usage messages for the programs should
 be sufficient.
 
 adns.h header file</A>, and the usage messages for the programs should
 be sufficient.
 


@@ -108,7 +108,7 @@ your project, and what you think of it.
 <p>
 
 Bug reports should be reported to the
 <p>
 
 Bug reports should be reported to the

-<a href="http://debbugs.gnu.org/">GNU Debbugs</a>.  Send an email
+<a href="https://debbugs.gnu.org/">GNU Debbugs</a>.  Send an email

 to <code>submit@debbugs.gnu.org</code> and at the top of your email,
 in a paragraph of its own, write the single line
 <pre>
 to <code>submit@debbugs.gnu.org</code> and at the top of your email,
 in a paragraph of its own, write the single line
 <pre>


@@ -131,7 +131,7 @@ will contain only announcements of important bugs, new versions, etc.
 <p>
 
 There are
 <p>
 
 There are

-<A href="http://www.chiark.greenend.org.uk/mailman/listinfo">archives
+<A href="https://www.chiark.greenend.org.uk/mailman/listinfo">archives

 and subscription web pages</A>, or you can subscribe by sending mail
 containing the word `subscribe' to
 <code>adns-announce-REQUEST@chiark.greenend.org.uk</code> or
 and subscription web pages</A>, or you can subscribe by sending mail
 containing the word `subscribe' to
 <code>adns-announce-REQUEST@chiark.greenend.org.uk</code> or


@@ -140,26 +140,26 @@ containing the word `subscribe' to
 <h2>Documentation</h2>
 
 <ul>
 <h2>Documentation</h2>
 
 <ul>

-<li><A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">adns.h
+<li><A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">adns.h

     API header file with documentation comments</A>
     API header file with documentation comments</A>

-<li><A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">usage
+<li><A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">usage

     message for adnshost</A>
 </ul>
 
 <h2>Download and source code</h2>
 
 <ul>
     message for adnshost</A>
 </ul>
 
 <h2>Download and source code</h2>
 
 <ul>

-<li>The <A href="http://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz">current
+<li>The <A href="https://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz">current

     release</A> as a gzipped tarfile.
     release</A> as a gzipped tarfile.

-<li><A href="http://www.chiark.greenend.org.uk/~ian/adns/ftp/">Previous
+<li><A href="https://www.chiark.greenend.org.uk/~ian/adns/ftp/">Previous

     versions</A> and other files (including OpenPGP signatures).
     versions</A> and other files (including OpenPGP signatures).

-<li><A href="http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/">master
+<li><A href="https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/">master

     git (version control) repository browser</a>.
 </ul>
 
 adns is also available from the
     git (version control) repository browser</a>.
 </ul>
 
 adns is also available from the

-<A href="http://www.gnu.org/">GNU Project</A> FTP servers and their
-<A href="http://www.gnu.org/order/ftp.html">mirrors</A>.
+<A href="https://www.gnu.org/">GNU Project</A> FTP servers and their
+<A href="https://www.gnu.org/order/ftp.html">mirrors</A>.

 
 <h2>Installation note</h2>
 
 
 <h2>Installation note</h2>
 


@@ -175,21 +175,21 @@ replies to adns's queries.
 <h2>References and related projects</h2>
 
 <ul>
 <h2>References and related projects</h2>
 
 <ul>

-<li><a href="http://code.google.com/p/adns-python">Python bindings</a>
+<li><a href="https://code.google.com/p/adns-python">Python bindings</a>

    by Andy Dustman.
    by Andy Dustman.

-<!-- <li><a href="http://cryp.to/hsdns/">Haskell bindings</a>
+<!-- <li><a href="https://cryp.to/hsdns/">Haskell bindings</a>

    by Peter Simons. -->
    by Peter Simons. -->

-<li><a href="http://www.lysator.liu.se/liboop/">liboop event loop library</a>
+<li><a href="https://www.lysator.liu.se/liboop/">liboop event loop library</a>

    has a built-in binding for adns.
    has a built-in binding for adns.

-<li><a href="http://adns.jgaa.com/">port to MS Visual Studio 6 C++</a>
+<li><a href="https://adns.jgaa.com/">port to MS Visual Studio 6 C++</a>

    by Jarle Aase.
 </ul>
 
 <h2>Copyright and licensing</h2>
 
    by Jarle Aase.
 </ul>
 
 <h2>Copyright and licensing</h2>
 

-<kbd>adns</kbd> is Copyright 1997-2000,2003,2006,2014-2016,2020 Ian
-Jackson, Copyright 2014 Mark Wooding, Copyright 1999-2000,2003,2006
-Tony Finch, and Copyright 1991 Massachusetts Institute of Technology.
+<kbd>adns</kbd> is
+Copyright Ian Jackson and contributors.
+(See the file INSTALL for a full list.)

 
 <p>
 
 
 <p>
 


@@ -204,14 +204,14 @@ This program and documentation is distributed in the hope that it will
 be useful, but <em>without any warranty</em>; without even the implied
 warranty of <em>merchantability</em> or <em>fitness for a particular
 purpose</em>.  See the
 be useful, but <em>without any warranty</em>; without even the implied
 warranty of <em>merchantability</em> or <em>fitness for a particular
 purpose</em>.  See the

-<A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt">GNU
+<A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt">GNU

 General Public License</A> for more details.
 
 <p>
 
 You should have received a copy of the GNU General Public License
 along with <kbd>adns</kbd>, or one should be available above; if not,
 General Public License</A> for more details.
 
 <p>
 
 You should have received a copy of the GNU General Public License
 along with <kbd>adns</kbd>, or one should be available above; if not,

-write to the <A href="http://www.fsf.org/">Free Software Foundation</A>
+write to the <A href="https://www.fsf.org/">Free Software Foundation</A>

 or email <code>ijackson@chiark.greenend.org.uk</code>.
 
 <p>
 or email <code>ijackson@chiark.greenend.org.uk</code>.
 
 <p>


@@ -220,13 +220,13 @@ or email <code>ijackson@chiark.greenend.org.uk</code>.
 Ian Jackson / <tt>ijackson@chiark.greenend.org.uk</tt>.
 <p>
 
 Ian Jackson / <tt>ijackson@chiark.greenend.org.uk</tt>.
 <p>
 

-<A href="http://www.gnu.org/">GNU home page</A>;
-<A href="http://www.chiark.greenend.org.uk/">chiark home page</A>;
+<A href="https://www.gnu.org/">GNU home page</A>;
+<A href="https://www.chiark.greenend.org.uk/">chiark home page</A>;

 <A href="/">site or mirror home page</A>
 <p>
 
 This web page is Copyright (C)1996-2005,2014-2016 Ian Jackson.  See the
 <A href="/">site or mirror home page</A>
 <p>
 
 This web page is Copyright (C)1996-2005,2014-2016 Ian Jackson.  See the

-<A href="http://www.chiark.greenend.org.uk/~ian/sw-www-copy.html">Copyright/acknowledgements</A>.
+<A href="https://www.chiark.greenend.org.uk/~ian/sw-www-copy.html">Copyright/acknowledgements</A>.

 
 </body>
 </html>
 
 </body>
 </html>

diff --git a/acconfig.h b/acconfig.h
index bf65d57ff949a187eb28cfdba9181fc88e06dd09..c5ea93ec58c6c2c6bda530b3a14a4ef13ce5fd8c 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -3,12 +3,8 @@
  * input file for autoheader/autoconf/configure: extra stuff for config.h
  */
 /*
  * input file for autoheader/autoconf/configure: extra stuff for config.h
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/aclocal.m4 b/aclocal.m4
index c23a0053f6e1a6f619135344b1f6a798eed6a171..cb8d92fd6af9595fd481baba5013073f48fe6615 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,11 +1,7 @@
 # aclocal.m4 - package-specific macros for autoconf
 #  
 # aclocal.m4 - package-specific macros for autoconf
 #  

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

diff --git a/changelog b/changelog
index a0cfb25bafbb354691971a4d17ae042a4f21d3f7..b48004eab7fa54363f93de218f4217a880ba1aec 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,57 @@
+adns (1.6.1) UPSTREAM; urgency=low
+
+  Minor bugfix:
+  * Suppress warning about `trust-ad` in resolv.conf.  Debian #1028112.
+
+  Build system:
+  * Honour DESTDIR, avoiding need for prefix= workaround.
+    [Contribution from Sergey Poznyakoff]
+  * regression tests: Add missing dependency on hsyscalls.h.
+    GNU #51329.  [Report from Sergei Trofimovich]
+  * regression tests: build with 64-bit time_t on 32-bit systems.
+    Debian #1065725, Ubuntu Launchpad #2057735.
+    [Report from Sebastian Ramacher]
+
+  Documentation:
+  * Fix all http: URLs in docs to be https: instead.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 05 May 2024 22:39:28 +0100
+
+adns (1.6.0) UPSTREAM; urgency=medium
+
+  Bugfixes:
+  * adnshost: Support --reverse in -f mode input stream
+  * timeout robustness against clock skew: track query start time and
+    duration.  Clock instability may now only cause spurious timeouts
+    rather than indefinite hangs or even assertion failures.
+
+  New features:
+  * adnshost: Offer ability to set adns checkc flags
+  * adnslogres: Honour --checkc-freq (if it comes first)
+  * adnsresfilter: Honour --checkc-freq and --checkc-entex
+  * time handling: Support use of CLOCK_MONOTONIC via an init flag.
+  * adns_str* etc.: Improve robustness; more allowable inputs values.
+
+  Build system improvements:
+  * clean targets: Delete $(TARGETS) too!
+  * Remove all m4 output files from the distributed source tree.
+  * Support DESTDIR=/some/absolute/path on `make install'.
+  * Provide autogen.sh.
+  * Rerun autoheader and autoconf (2.69).
+
+  Internal changes:
+  * adnshost: adh-opts.c: Whitespace adjustments to option table
+
+  Tests:
+  * New tests for fixes in 1.5.3.
+  * Fixes to test harness to avoid false positives during fuzzing.
+  * Other changes to support use with AFL.
+  * Many supporting improvements and refactorings.
+  * Fix skipped tests ($$ reference in Makefile)
+
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 11 Jun 2020 15:49:39 +0100
+

 adns (1.5.2) UPSTREAM; urgency=medium
 
   * Important security fixes:
 adns (1.5.2) UPSTREAM; urgency=medium
 
   * Important security fixes:

diff --git a/client/Makefile.in b/client/Makefile.in
index 6264482505769ddcbfab38922cfbc38b8248128b..36c8b74617f7751be822784505297dc658885f5b 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,11 +1,7 @@
 # client/Makefile - client program(s) Makefile
 # 
 # client/Makefile - client program(s) Makefile
 # 

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by


@@ -58,9 +54,9 @@ ALL_OBJS=     $(ADH_OBJS) $(TARG_OBJS)
 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)
 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)

-               mkdir -p $(bindir)
+               $(INSTALL_DIR) $(DESTDIR)$(bindir)

                set -xe; for f in $(TARG_INSTALL); \
                set -xe; for f in $(TARG_INSTALL); \

-                       do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
+                       do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done

 
 uninstall:
                for f in $(TARGETS); do rm -f $(bindir)/$$f; done
 
 uninstall:
                for f in $(TARGETS); do rm -f $(bindir)/$$f; done

diff --git a/client/addrtext.c b/client/addrtext.c
index 6f893b1d60896414b6590c42bab4ba8889e2ced5..e02bb5a1fe98d566da52d7d415d67d3148da2d13 100644 (file)
--- a/client/addrtext.c
+++ b/client/addrtext.c
@@ -21,12 +21,8 @@
  * - test program for address<->string conversion, not part of the library
  */
 /*
  * - test program for address<->string conversion, not part of the library
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/client/adh-main.c b/client/adh-main.c
index 0d1d57e3d10e5157d4f8cbab5b4a6304b3bd5463..a2dc5fe31b5730fdef15587743b7f6c1713cbe8f 100644 (file)
--- a/client/adh-main.c
+++ b/client/adh-main.c
@@ -4,12 +4,8 @@
  *   main program and useful subroutines
  */
 /*
  *   main program and useful subroutines
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/client/adh-opts.c b/client/adh-opts.c
index 590fce4fe988f555e5b0acb999c3b3ac5bbd6251..deea7d483eb7cc15f5635d036b610aa3118d78b9 100644 (file)
--- a/client/adh-opts.c
+++ b/client/adh-opts.c
@@ -4,12 +4,8 @@
  *   option handling tables etc.
  */
 /*
  *   option handling tables etc.
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/client/adh-query.c b/client/adh-query.c
index f24c573be0f1e0dab6e25b4bb5b43276abf976d1..479fe3c0b56b711fde4e211447f7c22ec21f8177 100644 (file)
--- a/client/adh-query.c
+++ b/client/adh-query.c
@@ -4,12 +4,8 @@
  *   make queries and print answers
  */
 /*
  *   make queries and print answers
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/client/adnsheloex.c b/client/adnsheloex.c
index 93e3b9119973530a4a612a65870c86d401f28934..3ac1cba7254bd3a87b66508db54fd6763080f0b6 100644 (file)
--- a/client/adnsheloex.c
+++ b/client/adnsheloex.c
@@ -3,15 +3,8 @@
  * - look up the A record of hosts in an Exim log that failed HELO verification
  */
 /*
  * - look up the A record of hosts in an Exim log that failed HELO verification
  */
 /*

- *  This file is
- *   Copyright (C) 2004 Tony Finch <dot@dotat.at>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/client/adnshost.h b/client/adnshost.h
index fd2d80d8f302d3983f7f7a3cc93eed7f1088180c..35d7811521c243cea529d7339a1adeb031486fc8 100644 (file)
--- a/client/adnshost.h
+++ b/client/adnshost.h
@@ -3,12 +3,8 @@
  * - useful general-purpose resolver client program, header file
  */
 /*
  * - useful general-purpose resolver client program, header file
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/client/adnslogres.c b/client/adnslogres.c
index 750a198f69aa45547ef0f27821b2578a1a135fab..3ce05ffa021661f6dae6a6040814b6fd1f5d3602 100644 (file)
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -3,16 +3,8 @@
  * - a replacement for the Apache logresolve program using adns
  */
 /*
  * - a replacement for the Apache logresolve program using adns
  */
 /*

- *  This file is
- *   Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
- *   Copyright (C) 1999-2000,2020 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/client/adnsresfilter.c b/client/adnsresfilter.c
index 2303f6fe22bc46020591c62e7f9bfbc6ae5281d6..038b3ad8bad8ee0a3c0340760ad53725fe8222e5 100644 (file)
--- a/client/adnsresfilter.c
+++ b/client/adnsresfilter.c
@@ -3,12 +3,8 @@
  * - filter which does resolving, not part of the library
  */
 /*
  * - filter which does resolving, not part of the library
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/client/adnstest.c b/client/adnstest.c
index 2198ebcdd23ad169be0f5487643619f6548065ad..0984399ed7be627af0b4fdda7e79c845b8aa80c8 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -3,12 +3,8 @@
  * - simple test program, not part of the library
  */
 /*
  * - simple test program, not part of the library
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/client/client.h b/client/client.h
index 5d9c271c83a2b547659acd597445e8faa90e27a9..76d021902092910db0e7208eb7417e889cf01b84 100644 (file)
--- a/client/client.h
+++ b/client/client.h
@@ -3,12 +3,8 @@
  * - useful declarations and definitions for adns client programs
  */
 /*
  * - useful declarations and definitions for adns client programs
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by


@@ -27,13 +23,10 @@
 #ifndef CLIENT_H_INCLUDED
 #define CLIENT_H_INCLUDED
 
 #ifndef CLIENT_H_INCLUDED
 #define CLIENT_H_INCLUDED
 

-#define ADNS_VERSION_STRING "1.5.2"
+#define ADNS_VERSION_STRING "1.6.1"

 
 #define COPYRIGHT_MESSAGE \
 
 #define COPYRIGHT_MESSAGE \

- "Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson\n" \
- "Copyright (C) 2014  Mark Wooding\n" \
- "Copyright (C) 1999-2000,2003,2006  Tony Finch\n" \
- "Copyright (C) 1991 Massachusetts Institute of Technology\n" \
+ "Copyright Ian Jackson and contributors\n" \

  "This is free software; see the source for copying conditions.  There is NO\n" \
  "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
  "This is free software; see the source for copying conditions.  There is NO\n" \
  "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 

diff --git a/client/fanftest.c b/client/fanftest.c
index 2d9e6fbb2c6837719538ebb99981b75fa687a5ba..d1cb2c79bbbdc77aa44e8c83a1569a80d078a453 100644 (file)
--- a/client/fanftest.c
+++ b/client/fanftest.c
@@ -3,16 +3,8 @@
  * - a small test program from Tony Finch
  */
 /*
  * - a small test program from Tony Finch
  */
 /*

- *  This file is
- *   Copyright (C) 1999 Tony Finch <dot@dotat.at>
- *   Copyright (C) 1999-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/common.make.in b/common.make.in
index 5e0e80b32a0ae43ef6bce75b330489f4522a0de1..5a5ba4d6ff30db095dc87907c62f0c465da1553a 100644 (file)
--- a/common.make.in
+++ b/common.make.in
@@ -1,12 +1,8 @@
 #  common.make[.in] - common configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  
 #  common.make[.in] - common configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by


@@ -22,7 +18,7 @@
 #  along with this program; if not, write to the Free Software Foundation.
 
 MAJOR=         1
 #  along with this program; if not, write to the Free Software Foundation.
 
 MAJOR=         1

-MINOR=         5
+MINOR=         6

 SHLIBFILE=     @SHLIBFILE@
 SHLIBSONAME=   @SHLIBSONAME@
 SHLIBFORLINK=  @SHLIBFORLINK@
 SHLIBFILE=     @SHLIBFILE@
 SHLIBSONAME=   @SHLIBSONAME@
 SHLIBFORLINK=  @SHLIBFORLINK@


@@ -71,4 +67,4 @@ endif
 
 INSTALL_PROGRAM=       $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA=          $(INSTALL) -m 644
 
 INSTALL_PROGRAM=       $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA=          $(INSTALL) -m 644

-
+INSTALL_DIR=           $(INSTALL) -d 755

diff --git a/configure.in b/configure.in
index 2894cf95eac8d4939f061655685732a664f20127..b753a5bb3e235b30d61b50e9a57dad25f384995b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,7 @@
 # configure.in - input to autoconf
 #  
 # configure.in - input to autoconf
 #  

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in
index 0083e1d5cb05800044c85a6d32e62b26c19fa8e8..d9151bd92ca6889e6e5dc0fe34ea0531f1ac279f 100644 (file)
--- a/dynamic/Makefile.in
+++ b/dynamic/Makefile.in
@@ -1,11 +1,7 @@
 # dynamic/Makefile - dynamic library Makefile
 # 
 # dynamic/Makefile - dynamic library Makefile
 # 

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by


@@ -31,9 +27,9 @@ ALLOBJS=      $(addsuffix _p.o, $(basename $(LIBOBJS)))
 
 install:
                mkdir -p $(libdir)
 
 install:
                mkdir -p $(libdir)

-               $(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
-               ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
-               ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
+               $(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE)
+               ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME)
+               ln -sf $(SHLIBSONAME) $(DESTDIR)$(libdir)/$(SHLIBFORLINK)

 
 uninstall:
                rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
 
 uninstall:
                rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 993c1af66e2fbda331aee965ac2bfc8d3665c43e..eb63a20442521eaa3678811aaae44cd782d63af6 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -1,11 +1,7 @@
 # regress/Makefile[.in] - regression test Makefile
 # 
 # regress/Makefile[.in] - regression test Makefile
 # 

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by


@@ -123,10 +119,10 @@ adnshost_fuzz:    $(ADH_OBJS) hplayback.o hfuzz.o $(HARNLOBJS)
 adnshost_fuzzraw: $(ADH_OBJS) hfuzzraw.o hfuzz.o $(HARNLOBJS)
                $(LINK_CMD)
 
 adnshost_fuzzraw: $(ADH_OBJS) hfuzzraw.o hfuzz.o $(HARNLOBJS)
                $(LINK_CMD)
 

-%_d.o:         $(srcdir)/../src/%.c hredirect.h
+%_d.o:         $(srcdir)/../src/%.c hredirect.h hsyscalls.h

                $(CC) $(CFLAGS) $(HCPPFLAGS) -c -g -o $@ $<
 
                $(CC) $(CFLAGS) $(HCPPFLAGS) -c -g -o $@ $<
 

-%_c.o:         $(srcdir)/../client/%.c hredirect.h
+%_c.o:         $(srcdir)/../client/%.c hredirect.h hsyscalls.h

                $(CC) $(CFLAGS) $(HCPPFLAGS) -I $(srcdir)/../src -c -g -o $@ $<
 
 $(ALL_OBJS):   $(srcdir)/../src/adns.h $(srcdir)/../src/internal.h
                $(CC) $(CFLAGS) $(HCPPFLAGS) -I $(srcdir)/../src -c -g -o $@ $<
 
 $(ALL_OBJS):   $(srcdir)/../src/adns.h $(srcdir)/../src/internal.h

diff --git a/regress/addcases b/regress/addcases
index e4fc73d0178035264e3237c886f341faf38c66f7..ad41a4865d76e386c96dc21df72216f5d045dba6 100755 (executable)
--- a/regress/addcases
+++ b/regress/addcases
@@ -1,12 +1,8 @@
 #!/bin/sh
 # usage: ./addcases <casename> ...
 #
 #!/bin/sh
 # usage: ./addcases <casename> ...
 #

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

diff --git a/regress/checkall b/regress/checkall
index 169e31718d48b345bc5ff58c56227d8ed6c10cc4..a6cb2298bd9f7aa5a0daa9c32b29d1414f646506 100755 (executable)
--- a/regress/checkall
+++ b/regress/checkall
@@ -2,12 +2,8 @@
 # usage: checkall
 # runs all test cases
 #
 # usage: checkall
 # runs all test cases
 #

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

diff --git a/regress/harness.h.m4 b/regress/harness.h.m4
index aa5618402a0af5ad9d12dbb0549a87474f83dc8e..1f24f2255fe0afee4e3432aea4777bd1698466f7 100644 (file)
--- a/regress/harness.h.m4
+++ b/regress/harness.h.m4
@@ -2,12 +2,8 @@ m4_dnl harness.h.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - function and other declarations
 
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - function and other declarations
 

-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).

 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by

diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4
index 74811a73e32807f1284aaeb57857ee7b637ae0c5..3fd2a103865b56bdc837faa4e6b76cb8a52d7166 100644 (file)
--- a/regress/hcommon.c.m4
+++ b/regress/hcommon.c.m4
@@ -2,12 +2,8 @@ m4_dnl hcommon.c
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - routines used for both record and playback
 
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - routines used for both record and playback
 

-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).

 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by

diff --git a/regress/hmacros.i4 b/regress/hmacros.i4
index 3119f2737fb37799160644c76cadc5ad41730e16..8aaf7a6b61c8def933f9eb8323c97931fe1aa8c6 100644 (file)
--- a/regress/hmacros.i4
+++ b/regress/hmacros.i4
@@ -2,12 +2,8 @@ m4_dnl hmacros.h.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - common macros
 
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - common macros
 

-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).

 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by

diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index dd98f0ec0b8bf1df4172286ebecfd07232318614..7e688bf1eac04f7ca2c5937ab17b16d87f7933e8 100644 (file)
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -2,12 +2,8 @@ m4_dnl hplayback.c.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - playback routines
 
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - playback routines
 

-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).

 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by


@@ -170,19 +166,25 @@ static int Perrno(const char *stuff) {
 
 static void P_updatetime(void) {
   int chars;
 
 static void P_updatetime(void) {
   int chars;

-  unsigned long sec, usec;
+  unsigned long sec;
+  long usec;

 
   if (!adns__vbuf_ensure(&vb2,1000)) Tnomem();
   fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
   chars= -1;
 
   if (!adns__vbuf_ensure(&vb2,1000)) Tnomem();
   fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
   chars= -1;

-  sscanf(vb2.buf," +%lu.%lu%n",&sec,&usec,&chars);
+  sscanf(vb2.buf," +%lu.%ld%n",&sec,&usec,&chars);

   if (chars==-1) Psyntax("update time invalid");
   currenttime.tv_sec+= sec;
   if (chars==-1) Psyntax("update time invalid");
   currenttime.tv_sec+= sec;

-  currenttime.tv_usec+= usec;
-  if (currenttime.tv_usec > 1000000) {
+  usec = (long)currenttime.tv_usec + usec;
+  while (usec < 0) {
+    currenttime.tv_sec--;
+    usec += 1000000;
+  }
+  while (usec > 1000000) {

     currenttime.tv_sec++;
     currenttime.tv_sec++;

-    currenttime.tv_usec -= 1000000;
+    usec -= 1000000;

   }
   }

+  currenttime.tv_usec = usec;

   if (vb2.buf[chars] != hm_squote\nhm_squote) Psyntax("not newline after update time");
 }
 
   if (vb2.buf[chars] != hm_squote\nhm_squote) Psyntax("not newline after update time");
 }
 

diff --git a/regress/hrecord.c.m4 b/regress/hrecord.c.m4
index c8a133e60cbd5db4be2b12484f8160caff367e36..94e661760a1e57a369b2dad89d2031e71ec1e6f8 100644 (file)
--- a/regress/hrecord.c.m4
+++ b/regress/hrecord.c.m4
@@ -2,12 +2,8 @@ m4_dnl hrecord.c.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - recording routines
 
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - recording routines
 

-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).

 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by

diff --git a/regress/hredirect.h.m4 b/regress/hredirect.h.m4
index a40783c9562ff589aece94d8ddf23b835f50c677..f2d5618e2c25607789e5344ec51dbfcb4bffd187 100644 (file)
--- a/regress/hredirect.h.m4
+++ b/regress/hredirect.h.m4
@@ -2,12 +2,8 @@ m4_dnl hredirect.h.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - redefinitions of system calls
 
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - redefinitions of system calls
 

-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).

 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by

diff --git a/regress/hsyscalls.h.m4 b/regress/hsyscalls.h.m4
index 9e622ec7debcd373cd671c32f1859a825f44af2d..53c5ef645804c31945d00b4a41b8ba0ec4af31cd 100644 (file)
--- a/regress/hsyscalls.h.m4
+++ b/regress/hsyscalls.h.m4
@@ -2,12 +2,8 @@ m4_dnl hsyscalls.h.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - prototypes of redefinitions of system calls
 
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - prototypes of redefinitions of system calls
 

-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).

 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by

diff --git a/regress/hsyscalls.i4 b/regress/hsyscalls.i4
index dbc584f031ffb8f087eb1a03e99b6e70311ef960..852cc93b263c6efe0c6cc8194b51cd0821467edd 100644 (file)
--- a/regress/hsyscalls.i4
+++ b/regress/hsyscalls.i4
@@ -2,12 +2,8 @@ m4_dnl hsyscalls.i4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - list of syscalls to override/log and their args
 
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - list of syscalls to override/log and their args
 

-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).

 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by

diff --git a/regress/m1test b/regress/m1test
index 5f928f12a9d2a4bb8a94212c84924b6579f6f4b7..37fab254f7c1dc2403e8b1d07fb70dc42afb5be0 100755 (executable)
--- a/regress/m1test
+++ b/regress/m1test
@@ -2,12 +2,8 @@
 # usage: m1test <name> <initfile> [<initflags>] <queryargs>'
 # test recording script
 #
 # usage: m1test <name> <initfile> [<initflags>] <queryargs>'
 # test recording script
 #

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

diff --git a/regress/r1test b/regress/r1test
index 7d5a4d8b9a00f3d292e55880453ed6af55f03a01..f61089af2d01b78c9ff66d2b0be81a4738ba7789 100755 (executable)
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,12 +2,8 @@
 # usage: r1test <testcasename>
 # test execution script, for running one test
 #
 # usage: r1test <testcasename>
 # test execution script, for running one test
 #

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

diff --git a/settings.make.in b/settings.make.in
index 4f8379a918f4f5dcbf3e9a529d539b750d93da0b..dfba4eaf71006eabec18590add0979e383fc4f73 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -1,12 +1,8 @@
 # settings.make[.in] - main configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  
 # settings.make[.in] - main configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

diff --git a/src/Makefile.in b/src/Makefile.in
index a84807e84e8edbf4ab801dfaec08429739bada9a..559257985b5f0cbb6259fc22868a4fe2bf695001 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,11 +1,7 @@
 # src/Makefile[.in] - library main Makefile
 # 
 # src/Makefile[.in] - library main Makefile
 # 

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by


@@ -32,8 +28,10 @@ DIRCFLAGS=   -I. -I$(srcdir)
 install:
                mkdir -p $(libdir) $(includedir)
                set -xe; for f in $(TARGETS); \
 install:
                mkdir -p $(libdir) $(includedir)
                set -xe; for f in $(TARGETS); \

-                       do $(INSTALL_DATA) $$f $(libdir)/$$f; done
-               $(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h
+                       do $(INSTALL_DIR) $(DESTDIR)$(libdir); \
+                           $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done
+               $(INSTALL_DIR)  $(DESTDIR)$(includedir)
+               $(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h

 
 uninstall:
                for f in $(TARGETS); do rm -f $(libdir)/$$f; done
 
 uninstall:
                for f in $(TARGETS); do rm -f $(libdir)/$$f; done

diff --git a/src/addrfam.c b/src/addrfam.c
index f114d74a4f61f5e7b458cdeea67aaf0e7be6ede2..dece6e3d1ce1efeb578d314ed520cd7219e509da 100644 (file)
--- a/src/addrfam.c
+++ b/src/addrfam.c
@@ -3,12 +3,8 @@
  * - address-family specific code
  */
 /*
  * - address-family specific code
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/adns.make b/src/adns.make
index 210be5d87d3469e1aa61f97e370122befc3713d5..64a42f2dc433d8d8df5d5bd63997c9bb763425c8 100644 (file)
--- a/src/adns.make
+++ b/src/adns.make
@@ -1,11 +1,7 @@
 # src/adns.make - library definitions, including list of object files
 # 
 # src/adns.make - library definitions, including list of object files
 # 

-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).

 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

diff --git a/src/check.c b/src/check.c
index f5e1a9eaa2c3df9d7fd075aeb8348b23f9bef21f..ead1249971000678ddd5db2429e10882966692e1 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -3,12 +3,8 @@
  * - consistency checks
  */
 /*
  * - consistency checks
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/config.h.in b/src/config.h.in
index ddc34623856874a29eb264ab33997149919dc7c1..e48c7ea470739346ccbc58720e1cf81b82a86308 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -4,12 +4,8 @@
  * input file for autoheader/autoconf/configure: extra stuff for config.h
  */
 /*
  * input file for autoheader/autoconf/configure: extra stuff for config.h
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/dlist.h b/src/dlist.h
index 7ffa22e8601fe6e3a9474dd87827eaef6a009ac7..0efb3101d6e5d9874ca711f531630670bf0983b1 100644 (file)
--- a/src/dlist.h
+++ b/src/dlist.h
@@ -3,12 +3,8 @@
  * - macros for handling doubly linked lists
  */
 /*
  * - macros for handling doubly linked lists
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/event.c b/src/event.c
index c326c2809714d5313ef6844912cf11ed2e9b6f1e..14c9ee9caee46cee23c0e80c66eae61cb29c6419 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -5,12 +5,8 @@
  * - user-visible check/wait and event-loop-related functions
  */
 /*
  * - user-visible check/wait and event-loop-related functions
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/general.c b/src/general.c
index cfe07bddbb5653b349d1f73c477e8ef72c174bd7..183c4877ecdfdf24272407ee00f4c74f5b9444e4 100644 (file)
--- a/src/general.c
+++ b/src/general.c
@@ -4,12 +4,8 @@
  * - vbuf handling
  */
 /*
  * - vbuf handling
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/internal.h b/src/internal.h
index c03a77b2f69199986e3cc32a70b94cce1b2126ef..083f429f4adbdb80dd24e4b2750d5f2651d34322 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -5,12 +5,8 @@
  * - comments regarding library data structures
  */
 /*
  * - comments regarding library data structures
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/parse.c b/src/parse.c
index 2eb68e4b7c794b9656a8030b7a8636ff78e3e3ea..3652b323632e94026a63246a48618e68527e5f20 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -3,12 +3,8 @@
  * - parsing assistance functions (mainly for domains inside datagrams)
  */
 /*
  * - parsing assistance functions (mainly for domains inside datagrams)
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/poll.c b/src/poll.c
index 6484b346dba5df13665734e5f0b5d959e8ca0d65..54d7a2fb3fd6a95b37a261001cc6f994272c0c50 100644 (file)
--- a/src/poll.c
+++ b/src/poll.c
@@ -3,12 +3,8 @@
  * - wrappers for poll(2)
  */
 /*
  * - wrappers for poll(2)
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/query.c b/src/query.c
index 82adbddb1562e0925646f9dd03d6ef4a3a796f44..7d537d54be4dd86e1f90042269eda12f3893db36 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -5,12 +5,8 @@
  * - query submission and cancellation (user-visible and internal)
  */
 /*
  * - query submission and cancellation (user-visible and internal)
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/reply.c b/src/reply.c
index caf5c05a95f66090022837488bedb701fa2ba9e4..e538674494662a50c65d1295ad9e685a54717c79 100644 (file)
--- a/src/reply.c
+++ b/src/reply.c
@@ -3,12 +3,8 @@
  * - main handling and parsing routine for received datagrams
  */
 /*
  * - main handling and parsing routine for received datagrams
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/setup.c b/src/setup.c
index 3646968cd7a3b27d9126f412f749212464abae6c..a10cbf8087f03bbe4e00a53c18d689d85bf02d18 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -4,12 +4,8 @@
  * - management of global state
  */
 /*
  * - management of global state
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by


@@ -348,6 +344,8 @@ static void ccf_options(adns_state ads, const char *fn,
        /* adns normally does IPv6 if the application wants it; control
         * this with the adns_af: option if you like */
        WORD_IS("inet6") ||
        /* adns normally does IPv6 if the application wants it; control
         * this with the adns_af: option if you like */
        WORD_IS("inet6") ||

+       /* adns trusts the resolver anyway */
+       WORD_IS("trust-ad") ||

        /* adns does not do edns0 and this is not a problem */
        WORD_IS("edns0"))
       continue;
        /* adns does not do edns0 and this is not a problem */
        WORD_IS("edns0"))
       continue;

diff --git a/src/transmit.c b/src/transmit.c
index bf2f8c608d47fdf8a74efb42402be781d6fa0bb8..f18f8d8fbdac4e34339d5c7951bb02d770b56aa3 100644 (file)
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -4,12 +4,8 @@
  * - send queries
  */
 /*
  * - send queries
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/tvarith.h b/src/tvarith.h
index 8dd7896cbb9b989d02194f625f931a520630bb0c..eb9be9b5ca8332bfb89d4c01e4ae41dab93fc72b 100644 (file)
--- a/src/tvarith.h
+++ b/src/tvarith.h
@@ -3,12 +3,8 @@
  * - static inline functions for doing arithmetic on timevals
  */
 /*
  * - static inline functions for doing arithmetic on timevals
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/src/types.c b/src/types.c
index 428dbfa6b2e1282e7a3c334acfd565be5a38650a..d79f4a07045e99f197b83b6aaaac34e0e7156f3a 100644 (file)
--- a/src/types.c
+++ b/src/types.c
@@ -3,12 +3,8 @@
  * - RR-type-specific code, and the machinery to call it
  */
 /*
  * - RR-type-specific code, and the machinery to call it
  */
 /*

- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by