Copyrights now acknowledge fanf for adns. Individual file copyrights too.

diff --git a/INSTALL b/INSTALL
index ffae5f531b3a5d769ba6d0c0b50692bb7ad17edd..25a3e954441ba086958c78f9b3196489aa24925f 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -26,7 +26,9 @@ COPYRIGHT
 This file, INSTALL, contains installation instructions and other
 details for adns.
 
 This file, INSTALL, contains installation instructions and other
 details for adns.
 

-adns is Copyright (C)1997-9 Ian Jackson <ian@davenant.greenend.org.uk>.
+adns is
+ Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ Copyright (C) 1999 Tony Finch <dot@dotat.at>

 
 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

diff --git a/Makefile.in b/Makefile.in
index 91d04f8cc2f9bb27cae03bdd426acf6317553357..b3655a69f4da831bb0e9aa62ecb35ef4c0be08d7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,12 @@
 # Makefile - top-level Makefile
 # Makefile - top-level Makefile

-# 
-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson

 #  
 #  

+#  This file is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+# 

 #  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
 #  the Free Software Foundation; either version 2, or (at your option)
 #  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
 #  the Free Software Foundation; either version 2, or (at your option)

diff --git a/acconfig.h b/acconfig.h
index 60f56144d5ff5d4f99431b5636f0983ecead383d..748d10ba11d2ff63ac08ebeabab17d7778413727 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -3,7 +3,12 @@
  * 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-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 b2d9e9f2a56f29a8dfb4636eeb9d7dfdb33fbb26..d5f21c8a99f15435b782a4bd43ab28aae9ae8646 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,12 @@
 # aclocal.m4 - package-specific macros for autoconf
 #  
 # aclocal.m4 - package-specific macros for autoconf
 #  

+#  This file is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+#  

 #  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
 #
 #  This program is free software; you can redistribute it and/or modify
 #  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
 #
 #  This program is free software; you can redistribute it and/or modify

diff --git a/client/Makefile.in b/client/Makefile.in
index c03b493fa5ae54a2a658da5543bfbc7fa2d12571..02effcb2b7cd9155380a36f6de7d796564342578 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,6 +1,11 @@
 # client/Makefile - client program(s) Makefile
 # 
 # client/Makefile - client program(s) Makefile
 # 

-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 #  
 #  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.c b/client/adnshost.c
index ad6bc21de955668e228fe47349f9eb8ae5540356..95831b773853988c3bddda6eb6cc51a4aa8aeda3 100644 (file)
--- a/client/adnshost.c
+++ b/client/adnshost.c
@@ -3,7 +3,12 @@
  * - useful general-purpose resolver client program
  */
 /*
  * - useful general-purpose resolver client program
  */
 /*

- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 bf17ccac1599e449eeb55a3674440e9dfcf71a28..c2ca2effead5eb0b66337760e3c14400ed34e741 100644 (file)
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -4,8 +4,12 @@
  */
 /*
  *  This file is
  */
 /*
  *  This file is

- *   Copyright (C) 1999 Tony Finch <fanf@demon.net> <dot@dotat.at>
+ *   Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *   Copyright (C) 1999 Ian Jackson <ian@davenant.greenend.org.uk>
  *   Copyright (C) 1999 Ian Jackson <ian@davenant.greenend.org.uk>

+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 67f287e03ec808c277667da07301c17096d2489f..4abd4ffae8a53cd80f9c8dbe7b2d43722d461781 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -3,7 +3,12 @@
  * - 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-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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/configure.in b/configure.in
index 4af860628fc602e7b01f7be6004535b7144f194a..c6e4a396b9db112f0ecd3a9b5cb256f3e9805ada 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,12 @@
 # configure.in - input to autoconf
 #  
 # configure.in - input to autoconf
 #  

-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>

 #
 #

+#  It is part of adns, which is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+#  

 #  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
 #  the Free Software Foundation; either version 2, or (at your option)
 #  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
 #  the Free Software Foundation; either version 2, or (at your option)

diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in
index 5a68a1a735556000cd3f2acae9f799cf538cf0f4..5ed63884d0633995e1750bd7dc4392bd4c1d487d 100644 (file)
--- a/dynamic/Makefile.in
+++ b/dynamic/Makefile.in
@@ -1,6 +1,11 @@
 # dynamic/Makefile - dynamic library Makefile
 # 
 # dynamic/Makefile - dynamic library Makefile
 # 

-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 #  
 #  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/Makefile.in b/regress/Makefile.in
index 606359ace9973e5c2ef6b1ae0222d1c1f567eedc..3ed85f1fe56f6cb9081ee98c3deef70007e561ff 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -1,6 +1,11 @@
 # regress/Makefile - regression test Makefile
 # 
 # regress/Makefile - regression test Makefile
 # 

-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 #  
 #  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 a2e278847cff822e28c6efb61ca9ae27bef9b0fa..12ecc3ee59ea13021a8044b00f61bb61013c6cb6 100644 (file)
--- a/regress/harness.h.m4
+++ b/regress/harness.h.m4
@@ -2,7 +2,12 @@ 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 Copyright (C) 1997-1999 Ian Jackson
+m4_dnl  This file is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl
+m4_dnl  It is part of adns, which is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 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 19c7ba421c52fa721afb1122b1fa8b88eb98db9d..b636a75d83410e7e53327744a2c76fb221693710 100644 (file)
--- a/regress/hcommon.c.m4
+++ b/regress/hcommon.c.m4
@@ -2,7 +2,12 @@ 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 Copyright (C) 1997-1999 Ian Jackson
+m4_dnl  This file is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl
+m4_dnl  It is part of adns, which is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 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 9433b18fb218563f1cb0f5586cfdadba6a11bfc8..c9c3b7ad0ccf11850da5b0150379182b0ff53433 100644 (file)
--- a/regress/hmacros.i4
+++ b/regress/hmacros.i4
@@ -2,7 +2,12 @@ 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 Copyright (C) 1997-1999 Ian Jackson
+m4_dnl  This file is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl
+m4_dnl  It is part of adns, which is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 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 8e6424f3e67b8bb5267c6208058afc97f713f95f..6b08ac4a99818b8cef0e6e265e243b9614d4f7c9 100644 (file)
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -2,7 +2,12 @@ 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 Copyright (C) 1997-1999 Ian Jackson
+m4_dnl  This file is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl
+m4_dnl  It is part of adns, which is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 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/hrecord.c.m4 b/regress/hrecord.c.m4
index 4344146080dd66bce63db60cdb0f07fce57872e4..1e98c82a5d7c26ae1b9bcc7c1ad4e69ef8ed4a14 100644 (file)
--- a/regress/hrecord.c.m4
+++ b/regress/hrecord.c.m4
@@ -2,7 +2,12 @@ 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 Copyright (C) 1997-1999 Ian Jackson
+m4_dnl  This file is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl
+m4_dnl  It is part of adns, which is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 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 59206e078951d0e26250a702005b96b00fcd0d4e..9c4bdad7ab7834a4c762c5f1df933370b456d5a2 100644 (file)
--- a/regress/hsyscalls.i4
+++ b/regress/hsyscalls.i4
@@ -2,7 +2,12 @@ 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 Copyright (C) 1997-1999 Ian Jackson
+m4_dnl  This file is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl
+m4_dnl  It is part of adns, which is
+m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+m4_dnl    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 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/settings.make.in b/settings.make.in
index 7e0a249ede75a71ad00f9a29ee353fcebc732581..0967cd57f1c77e5d0d26a5de67834f0ece063f0e 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -1,8 +1,13 @@
 # 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-1999 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>

 #
 #

+#  It is part of adns, which is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+#  

 #  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
 #  the Free Software Foundation; either version 2, or (at your option)
 #  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
 #  the Free Software Foundation; either version 2, or (at your option)

diff --git a/src/Makefile.in b/src/Makefile.in
index 43de7a4bedfc00111bc2f0ddd7ba60e6873b77f0..75d867a4967d7df1aa0e221e3a9a650cb8d3af6e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,11 @@
 # src/Makefile - library main Makefile
 # 
 # src/Makefile - library main Makefile
 # 

-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 #  
 #  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.h b/src/adns.h
index 070659de8c130b3fa92ff0da4e585958ccadbce6..aec2047d5f90590d39f73f6d1d35527974538627 100644 (file)
--- a/src/adns.h
+++ b/src/adns.h
@@ -3,7 +3,13 @@
  * - adns user-visible API (single-threaded, without any locking)
  */
 /*
  * - adns user-visible API (single-threaded, without any locking)
  */
 /*

- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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


@@ -14,11 +20,37 @@
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.

+ *
+ * 
+ *  For the benefit of certain LGPL'd `omnibus' software which provides
+ *  a uniform interface to various things including adns, I make the
+ *  following additional licence.  I do this because the GPL would
+ *  otherwise force either the omnibus software to be GPL'd or for the
+ *  adns-using part to be distributed separately.
+ *  
+ *  So, you may also redistribute and/or modify adns.h (but only the
+ *  public header file adns.h and not any other part of adns) under the
+ *  terms of the GNU Library General Public License as published by the
+ *  Free Software Foundation; either version 2 of the License, or (at
+ *  your option) any later version.

  *  
  *  

- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
+ *  Note that adns itself is GPL'd.  Authors of adns-using applications
+ *  with GPL-incompatible licences, and people who distribute adns with
+ *  applications where the whole distribution is not GPL'd, are still
+ *  likely to be in violation of the GPL.  Anyone who wants to do this
+ *  should contact Ian Jackson.  Please note that to avoid encouraging
+ *  people to infringe the GPL as it applies the body of adns, I think
+ *  that if you take advantage of the special exception to redistribute
+ *  just adns.h under the LGPL, you should retain this paragraph in its
+ *  place in the appropriate copyright statements.
+ *
+ *
+ *  You should have received a copy of the GNU General Public License,
+ *  or the GNU Library General Public License, as appropriate, along
+ *  with this program; if not, write to the Free Software Foundation,

  *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *

+ *

  *  $Id$
  */
 
  *  $Id$
  */
 

diff --git a/src/adns.make b/src/adns.make
index e7ba997bb15ec9fe19f04224e8643dabe1c3b765..d46807589680ae7a9890de488a63f1e35007e471 100644 (file)
--- a/src/adns.make
+++ b/src/adns.make
@@ -1,6 +1,11 @@
 # 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-1999 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999 Tony Finch <dot@dotat.at>

 #  
 #  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 04c5c8e0c30dee087511ae3d0a9ba1400942ef62..25de10d872f14968db65c071aada133804f2d87e 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -3,7 +3,12 @@
  * - consistency checks
  */
 /*
  * - consistency checks
  */
 /*

- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 c156e75f6be20a159c33b4bf42f33f7aa61a5f66..56b570fbc7996df643df6f62316fd108b9a6cec6 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -5,7 +5,12 @@
  * - 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-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 00a1ae808f2d7ef23d3ba4faf1ba693efb9ac76e..5ebdd6ad9c935dedac15285e0137dfdf4442f208 100644 (file)
--- a/src/general.c
+++ b/src/general.c
@@ -4,7 +4,12 @@
  * - vbuf handling
  */
 /*
  * - vbuf handling
  */
 /*

- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 b0e96c7eb43bde912719c20e3990b070723e5add..89327ec89fb785396cedf19af3d41d79a0062daf 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -5,7 +5,12 @@
  * - comments regarding library data structures
  */
 /*
  * - comments regarding library data structures
  */
 /*

- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 5c4bdaf7a9196fe9ffbc67eb52c8dbd4c21cc427..9a4e0c7483498daad8ed12180398cd31fe68dccd 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -3,7 +3,12 @@
  * - 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-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 1fe28f403f1cdb0ee0fd3d197eaeb8860b981c04..fba6de56646a80b9edd41476d165f1853d165c2d 100644 (file)
--- a/src/poll.c
+++ b/src/poll.c
@@ -3,7 +3,12 @@
  * - wrappers for poll(2)
  */
 /*
  * - wrappers for poll(2)
  */
 /*

- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 ec545625310c11cbb46535e37a7dd0dde1a7b60b..53eecd9b902e47ff11c30700da4a8dcbfbfc4032 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -5,7 +5,12 @@
  * - 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-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 7db623b9d5d92e4b2fcb092766a7020dc4151a1f..4b3d74fa6b5ad6427f3f064da00c0ee0ceb5220f 100644 (file)
--- a/src/reply.c
+++ b/src/reply.c
@@ -3,7 +3,12 @@
  * - 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-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 6ef2d120eeed53d85b4aab2718fdb16be639b18c..8604f8e0fe7939a25be3338b511afbe3f481a574 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -4,7 +4,12 @@
  * - management of global state
  */
 /*
  * - management of global state
  */
 /*

- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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/transmit.c b/src/transmit.c
index fc712b1f04901bb74d123a5ce312fc3f6572ba21..4590a16c7f74c95eb3b0dce8b84aeb827c628eaf 100644 (file)
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -4,7 +4,12 @@
  * - send queries
  */
 /*
  * - send queries
  */
 /*

- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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 f7c181076655abaf585460a5160a6be78878dc07..5cc2d15a45681d21832f61b81d25c07e23217661 100644 (file)
--- a/src/types.c
+++ b/src/types.c
@@ -3,7 +3,12 @@
  * - 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-1999 Ian Jackson
+ *  This file is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ *  It is part of adns, which is
+ *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999 Tony Finch <dot@dotat.at>

  *  
  *  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