consolidate license change previously announced here:

http://mailman.powerdns.com/pipermail/pdns-announce/2005-February/000022.html

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@681 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh
index 302d840b4dc236166b1bb924117a88cb48e3e045..45a4e41029aab9314e6c812e7a5dce0674749ca9 100644 (file)
--- a/modules/ldapbackend/ldapbackend.hh
+++ b/modules/ldapbackend/ldapbackend.hh
@@ -3,8 +3,8 @@
  *  Copyright (C) 2003 Norbert Sendetzky <norbert@linuxnetworks.de>
  *
  *  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 of the License, or
+ *  it under the terms of the GNU General Public License version 2
+ *  the Free Software Foundation
  *  any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/modules/ldapbackend/powerldap.hh b/modules/ldapbackend/powerldap.hh
index 6d2f4a372c19e62a076b5156a0683426cf906e64..0d54f5d3e4686798e5c30c99dc548afe720bafd3 100644 (file)
--- a/modules/ldapbackend/powerldap.hh
+++ b/modules/ldapbackend/powerldap.hh
@@ -4,8 +4,8 @@
  *  By Norbert Sendetzky <norbert@linuxnetworks.de>
  *
  *  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 of the License, or
+ *  it under the terms of the GNU General Public License version 2
+ *  the Free Software Foundation
  *  any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/modules/ldapbackend/zone2ldap.cc b/modules/ldapbackend/zone2ldap.cc
index 1c3f8d37096990f55ed0d9ca1c1d456afc4d8a6e..695e6de9d166cfe9db2cc4af7b0674b9be03fa5e 100644 (file)
--- a/modules/ldapbackend/zone2ldap.cc
+++ b/modules/ldapbackend/zone2ldap.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2003  Norbert Sendetzky
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/modules/odbcbackend/odbcbackend.cc b/modules/odbcbackend/odbcbackend.cc
index 566483a3f67b330543daa26264c8f31ecb76048b..4783e02bd8a71c5450d82a15bbf152e169e89239 100644 (file)
--- a/modules/odbcbackend/odbcbackend.cc
+++ b/modules/odbcbackend/odbcbackend.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/modules/odbcbackend/odbcbackend.hh b/modules/odbcbackend/odbcbackend.hh
index 5d066e3e2893c5c88f60f12db43fc699b1c15287..7e1c6d20193ee9013a54512a8e38a774bd8ceca5 100644 (file)
--- a/modules/odbcbackend/odbcbackend.hh
+++ b/modules/odbcbackend/odbcbackend.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/modules/opendbxbackend/odbxbackend.hh b/modules/opendbxbackend/odbxbackend.hh
index d6b72cf49498c4568f3d77b006fc7921bfacb2bd..20a1ed725c400ac718f78a3bed7da4c32414dc17 100644 (file)
--- a/modules/opendbxbackend/odbxbackend.hh
+++ b/modules/opendbxbackend/odbxbackend.hh
@@ -3,8 +3,8 @@
  *  Copyright (C) 2005 Norbert Sendetzky <norbert@linuxnetworks.de>
  *
  *  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 of the License, or
+ *  it under the terms of the GNU General Public License version 2
+ *  the Free Software Foundation
  *  any later version.
  *
  *  This program is distributed in the hope that it will be useful,

diff --git a/pdns/ahuexception.hh b/pdns/ahuexception.hh
index ad35df5529fc1e72fa7e1b6d3269f8bbe85da9ba..ae020ae49fd4b8085b8ffeea9d3b038a0f007692 100644 (file)
--- a/pdns/ahuexception.hh
+++ b/pdns/ahuexception.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/arguments.hh b/pdns/arguments.hh
index 774d95ed4abeea4f2129ef725dfa08d1001fb149..58cff6768f4dc5b55b0b3f16cb62704984b73eb7 100644 (file)
--- a/pdns/arguments.hh
+++ b/pdns/arguments.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/backends/bind/bindbackend.hh b/pdns/backends/bind/bindbackend.hh
index 7a700c82c6cd0645bfcda05f8b4c7cbe460ec48c..ed0e7d00ef412a77560bf08c1672a33c9b4efae8 100644 (file)
--- a/pdns/backends/bind/bindbackend.hh
+++ b/pdns/backends/bind/bindbackend.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/backends/bind/bindparser.cc b/pdns/backends/bind/bindparser.cc
index 4a08a2db091a727b0f789c3edc6253dde4f054cb..535578cffe9c74e8abe9d1df8abf4daf4875aa80 100644 (file)
--- a/pdns/backends/bind/bindparser.cc
+++ b/pdns/backends/bind/bindparser.cc
@@ -4,8 +4,8 @@
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
    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)
+   it under the terms of the GNU General Public License version 2
+   as published by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/pdns/backends/bind/bindparser.hh b/pdns/backends/bind/bindparser.hh
index 615414c54a8413ae6978dfc558700eb3204c4b67..8b130d09e5b8d4fa8f35a6b5e124fb1288e3ca19 100644 (file)
--- a/pdns/backends/bind/bindparser.hh
+++ b/pdns/backends/bind/bindparser.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/backends/bind/huffman.cc b/pdns/backends/bind/huffman.cc
index da0debee3116c9560e37b6cf7c4d9f3a38257688..64e48b51dbb622b1080a17ba6e30e701cf58b279 100644 (file)
--- a/pdns/backends/bind/huffman.cc
+++ b/pdns/backends/bind/huffman.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/backends/bind/huffman.hh b/pdns/backends/bind/huffman.hh
index 7e288603af6ad938d1368b74763aee7e0673cf7f..1ca1916e66f8d6c5128011e85946332046d81ba6 100644 (file)
--- a/pdns/backends/bind/huffman.hh
+++ b/pdns/backends/bind/huffman.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/backends/bind/zone2ldap.cc b/pdns/backends/bind/zone2ldap.cc
index 0e13a4b1d04b48273b7fd1cef323eb5a1b2aa55d..f6b5a5978c0c9acf4e660053ebffd45526f58ce3 100644 (file)
--- a/pdns/backends/bind/zone2ldap.cc
+++ b/pdns/backends/bind/zone2ldap.cc
@@ -3,9 +3,9 @@
  *  Copyright (C) 2003  Norbert Sendetzky
  *
  *  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 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 2
+ *  the Free Software Foundation
+ *  
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/backends/bind/zone2sql.cc b/pdns/backends/bind/zone2sql.cc
index 39669456206365e8277fc5521d7c3c40951563a4..1c61d977f50f76a9192d3763323ee36f2793e59c 100644 (file)
--- a/pdns/backends/bind/zone2sql.cc
+++ b/pdns/backends/bind/zone2sql.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/backends/bind/zoneparser.hh b/pdns/backends/bind/zoneparser.hh
index a60fd6cf3d52e792d30400b7c82e18ef20c2efe4..9088aefdfb104c95051b69fbe14dfddbcbe95913 100644 (file)
--- a/pdns/backends/bind/zoneparser.hh
+++ b/pdns/backends/bind/zoneparser.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/binpatch.cc b/pdns/binpatch.cc
index dfee0dee2659d402a59b8dbfe8f7d846a5e4ea57..733f340e6b2bcef811e55f71ff05c36d4a9fafb2 100644 (file)
--- a/pdns/binpatch.cc
+++ b/pdns/binpatch.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 810c6500c9c2b800a981731b97ebd60aaa5a8c99..4632c279bf415f89c4f0c8c77e1ad9fe8c97b17b 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2005  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/common_startup.hh b/pdns/common_startup.hh
index 24ffd687219ce94c938a3732f63cf3e7f7424271..be439c71dbf5c1e9fdc6acabfd236feb76763c25 100644 (file)
--- a/pdns/common_startup.hh
+++ b/pdns/common_startup.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/communicator.hh b/pdns/communicator.hh
index 1f59b883af500a29de135d1b9b3f96623201ae1e..653cca14f1cf86affed58b1b5bec53ddf3216def 100644 (file)
--- a/pdns/communicator.hh
+++ b/pdns/communicator.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index ddb01ba11e42bcd85cd34b11bbcc1288d2f6527c..3a346ed031119fdd8350ed3a97622046a90ab1ed 100644 (file)
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/dns.hh b/pdns/dns.hh
index e68598adc826b63bdc5ae74ab375b0bf3dca95e2..d6d529a37652042bba22afbf27e71ac7c0304101 100644 (file)
--- a/pdns/dns.hh
+++ b/pdns/dns.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index 5786610e6b7c6be9e1b6b299cd3ec78d8580db37..75644d7c3affbe3013f07464a29bad7de1a45583 100644 (file)
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2005  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/dnsbackend.hh b/pdns/dnsbackend.hh
index b057032ac396dff1d65fc0658545fa309787dfc2..d68e4601adcbd8e1fe5efbf91fb68e69f5043c97 100644 (file)
--- a/pdns/dnsbackend.hh
+++ b/pdns/dnsbackend.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/dnsproxy.hh b/pdns/dnsproxy.hh
index fabb4a86ac98f09f66fde25ea24f7c66c89633e4..33683fa04c460b739101e761087fa6bcbfe5350c 100644 (file)
--- a/pdns/dnsproxy.hh
+++ b/pdns/dnsproxy.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/dynhandler.hh b/pdns/dynhandler.hh
index 151d0aa30e2a9adbc0c9f85aea67988729550950..c64b2396363f8ea57d0e21c18a70fa78e9b9566c 100644 (file)
--- a/pdns/dynhandler.hh
+++ b/pdns/dynhandler.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/dynlistener.hh b/pdns/dynlistener.hh
index 939a6cbfc1674e1ac1a9643809cf0ab9b7974f7d..133ce809d8db91bcc724769ee9e8ec7843063750 100644 (file)
--- a/pdns/dynlistener.hh
+++ b/pdns/dynlistener.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/dynmessenger.cc b/pdns/dynmessenger.cc
index cc99367f6defb91a71bdaea3f5116f300221795d..bcc7c322cd35d0b626c87f30bea5aabe670907d8 100644 (file)
--- a/pdns/dynmessenger.cc
+++ b/pdns/dynmessenger.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/dynmessenger.hh b/pdns/dynmessenger.hh
index 522bb26b758a49fd37768a8548009b3bd524fcbe..3f634cb13b7a66319c658e11dbeb44724729c6ec 100644 (file)
--- a/pdns/dynmessenger.hh
+++ b/pdns/dynmessenger.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 52be35f58d1a5fd6d58e2ac7391a772016a4fbe5..611f385fabbf22dde5618b8ea9d5cd720e75dc62 100644 (file)
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/lock.hh b/pdns/lock.hh
index 5b4ffce53a737d2cf9e727720dd673ffe0f9d616..24af8452c6ac03242d02c58a197cc5b1b0de5570 100644 (file)
--- a/pdns/lock.hh
+++ b/pdns/lock.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/lwres.hh b/pdns/lwres.hh
index c4e3be3aae74098a7f42108df648f0c87e892268..d693715555d8d396bbc77f72054428e2526d46bb 100644 (file)
--- a/pdns/lwres.hh
+++ b/pdns/lwres.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002 - 2005 PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/misc.cc b/pdns/misc.cc
index 060d1f078ba748bf7da5c75c753686c1a11f0414..4fb50c940372e23f1b1c12212a8d295e854a1f7d 100644 (file)
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/misc.hh b/pdns/misc.hh
index 82039959df242e6b25ce6b7e585861d1e7fb301b..c3ae854730015a2f7c7594c5ecdf744e8c7c4d16 100644 (file)
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002-2005  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/mtasker.hh b/pdns/mtasker.hh
index 25f7b6b8e4396d2d33f5e20c21fa74fcd2eb44d7..5d15189078957bed3707ad1b8bdbb6e683a87590 100644 (file)
--- a/pdns/mtasker.hh
+++ b/pdns/mtasker.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002 - 2006  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/ntservice.cc b/pdns/ntservice.cc
index cfcee00982203360179ac188785af935143c447a..b92f03a9f5d2b0f5b183e2fe4fa5f63ce718fb85 100644 (file)
--- a/pdns/ntservice.cc
+++ b/pdns/ntservice.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/ntservice.hh b/pdns/ntservice.hh
index e1a96ebfc8237f3b74be61595120abed750222ab..64fb9f8975afe83dc87b578ec7483c5c503b661e 100644 (file)
--- a/pdns/ntservice.hh
+++ b/pdns/ntservice.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/packetcache.hh b/pdns/packetcache.hh
index 80710ff45c5b1d3baa0a6446ae001bc3a5bfa126..5270ac086b87b59d8282448c6bb98e3ad670dd0b 100644 (file)
--- a/pdns/packetcache.hh
+++ b/pdns/packetcache.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/packethandler.hh b/pdns/packethandler.hh
index 746432505e67748c4f6f6046c3d72c36ddd3b42f..34f233a3061b4b4e12121165e06b94863fa90b8c 100644 (file)
--- a/pdns/packethandler.hh
+++ b/pdns/packethandler.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/pdnsmsg.cc b/pdns/pdnsmsg.cc
index 3fc32246ebe97d2e4d60e87238e4bc2eb3ed6c7d..7f0a479917652806b6ff56e365d5ba81b44e49f2 100644 (file)
--- a/pdns/pdnsmsg.cc
+++ b/pdns/pdnsmsg.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/pdnsservice.cc b/pdns/pdnsservice.cc
index 2fa638d141f8c1067dc6da3b952391a4fb41a0ec..76b890a137ca4cafdbd6a5562e5fbfd58971c048 100644 (file)
--- a/pdns/pdnsservice.cc
+++ b/pdns/pdnsservice.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/pdnsservice.hh b/pdns/pdnsservice.hh
index 9d0ff04c471aed48e6d50ed893a9e1f24398f947..7ad7f71dfba8a3fcc4f5567386973b6bddcca4a0 100644 (file)
--- a/pdns/pdnsservice.hh
+++ b/pdns/pdnsservice.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/qtype.cc b/pdns/qtype.cc
index 4148ab3a2e2853b1a70593b2b58fb24645786fc1..65e52cedfcdf06279174a6a466c4d34e0d34562a 100644 (file)
--- a/pdns/qtype.cc
+++ b/pdns/qtype.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/qtype.hh b/pdns/qtype.hh
index 62c5eeedb9d455ac98e3714f2215b6504b67159e..e7058179467e0c1ab286386a95210e8e8a35a59b 100644 (file)
--- a/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/randombackend.cc b/pdns/randombackend.cc
index 21bd22f291a43377bbe96f9d31b0206a0a549d4d..97ce6b76bec1d7402a9dd7488014bd4be3eaaa97 100644 (file)
--- a/pdns/randombackend.cc
+++ b/pdns/randombackend.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 56757a26abcbe21cf694acf4fbcaf1e3fd765095..92d9d81148a225d8e3c96e56431cf3462b9ea720 100644 (file)
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -3,8 +3,8 @@
     Copyright (C) 2002 - 2006  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 as published by
-    the Free Software Foundation
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
 
 
     This program is distributed in the hope that it will be useful,

diff --git a/pdns/recursorservice.cc b/pdns/recursorservice.cc
index cefd249b889af8283fe44b04ea8da799b0b44b63..a7303aab6aae3a70e5890af02a72f5e57bfce2b2 100644 (file)
--- a/pdns/recursorservice.cc
+++ b/pdns/recursorservice.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/recursorservice.hh b/pdns/recursorservice.hh
index a7fd671d40f500e7fceb3c6929f523815c305d32..55361f7d4226174ca6bf4ea87fa5272ac317057b 100644 (file)
--- a/pdns/recursorservice.hh
+++ b/pdns/recursorservice.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/resolver.hh b/pdns/resolver.hh
index 285676563580229d6e647f2b9e884b22d10be968..f81b9a6a05ce3cd012c457902ce4c9af955be9cb 100644 (file)
--- a/pdns/resolver.hh
+++ b/pdns/resolver.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/session.cc b/pdns/session.cc
index 42b5f6be13264885eb744e0bb6eb39bc7665d2cf..5949f91fedd15d21a6a015700e42c73975ae54be 100644 (file)
--- a/pdns/session.cc
+++ b/pdns/session.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/session.hh b/pdns/session.hh
index b8948272f4bb9ddbd0c0e405858a65ba62c4d03a..598f0b8443ab0d1b0d920f096cfc30e686bc013e 100644 (file)
--- a/pdns/session.hh
+++ b/pdns/session.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/singleton.hh b/pdns/singleton.hh
index b7889c4918c7bfeb637c998b2050c1fcbafdbe5c..5a2482ff1fe86e6d9bbef5141222ea5df5692124 100644 (file)
--- a/pdns/singleton.hh
+++ b/pdns/singleton.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/statbag.cc b/pdns/statbag.cc
index a8eac6899c08f62753f2b6c2ffacb5eaeb53839b..8b7d8d8f9b274144615a4fd733ad47af7ba7ec74 100644 (file)
--- a/pdns/statbag.cc
+++ b/pdns/statbag.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/statbag.hh b/pdns/statbag.hh
index 3ceeaffe396feb9598c1c2f491c17c5dd4398ec6..6d9b8ed96bde2e8ef87ec776fecf03173ace0239 100644 (file)
--- a/pdns/statbag.hh
+++ b/pdns/statbag.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index f9c4f6d3ed04aa3cdb59f1a5597e5ec409748ad2..e85ef581f869e69f522c47667fb972eae9275971 100644 (file)
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002-2005  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/tcpreceiver.hh b/pdns/tcpreceiver.hh
index a7cc66505fdef660739335d78647fa1c982a01b4..d51448d40e40404909a90b8f242c7206f6a2420b 100644 (file)
--- a/pdns/tcpreceiver.hh
+++ b/pdns/tcpreceiver.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh
index 2f5d387da9132036ddc188653c5549968d5f76eb..7f4552b909a12ed9e36a15e09d5af90da041b3d4 100644 (file)
--- a/pdns/ueberbackend.hh
+++ b/pdns/ueberbackend.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/utility.hh b/pdns/utility.hh
index 1e553b726e751b1c0cebb42cf605a4e952a74a37..23034956a80bab3bace65ec88162b56187b0552a 100644 (file)
--- a/pdns/utility.hh
+++ b/pdns/utility.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 999a9071cda392a93f32982f009f7a90d85a2cd5..6fd15d75c2bd6e10376b8312d9d2b354de96d620 100644 (file)
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/webserver.hh b/pdns/webserver.hh
index 20290625cd7cf08aef2605d513ed48024554a9d0..e49249e14e5f7702b0f8ba72a9d822cb26a0789c 100644 (file)
--- a/pdns/webserver.hh
+++ b/pdns/webserver.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/win32_dynlistener.cc b/pdns/win32_dynlistener.cc
index 18fb2393ec5197b916ed6121d3bd7e5ef78fcc48..c4297750bc5d5279b4493f2d26782d4a16a0e404 100644 (file)
--- a/pdns/win32_dynlistener.cc
+++ b/pdns/win32_dynlistener.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/win32_dynloader.cc b/pdns/win32_dynloader.cc
index a8d92d1c907c3e1b97046c28cb8b38667f4f4780..9d15ae573d5d6d8e27505b6e0a17ab60bb4f5bbc 100644 (file)
--- a/pdns/win32_dynloader.cc
+++ b/pdns/win32_dynloader.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/win32_dynmessenger.cc b/pdns/win32_dynmessenger.cc
index 02d706b46d4cff8f78821c55338776f14760625a..bad3926aeedccdb1da7f468f8a832b355c1900a4 100644 (file)
--- a/pdns/win32_dynmessenger.cc
+++ b/pdns/win32_dynmessenger.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/win32_logger.cc b/pdns/win32_logger.cc
index d9b344d2eea0660f67a909805e2cb58c5ff7254e..176d11b3bc6d5ccb27457c63a4372d5c97b8d411 100644 (file)
--- a/pdns/win32_logger.cc
+++ b/pdns/win32_logger.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/win32_mtasker.hh b/pdns/win32_mtasker.hh
index d3b6780bf524bc167689030b04d2a3f3e8e454d0..63cdef484bcbcbd82b585e714e44171a6099773a 100644 (file)
--- a/pdns/win32_mtasker.hh
+++ b/pdns/win32_mtasker.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/win32_pdns_recursor.cc b/pdns/win32_pdns_recursor.cc
index c95d839a021535530e76e9d27d8bd0a5a45ec60c..82d079e78cdd9e7cc304a418efd5113819d2ed9e 100644 (file)
--- a/pdns/win32_pdns_recursor.cc
+++ b/pdns/win32_pdns_recursor.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/win32_receiver.cc b/pdns/win32_receiver.cc
index 0064bc2535b7787870c3492c36e8b6348ea4f462..0b03874ec038b2fa8c983e57e2e03a178e6681b1 100644 (file)
--- a/pdns/win32_receiver.cc
+++ b/pdns/win32_receiver.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2003  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/win32_utility.cc b/pdns/win32_utility.cc
index 42563b313362e644a1b25dd46123c6d8edad016b..6ff0641e2fe79ef3d3cd3ad232f5d1ee75561adb 100644 (file)
--- a/pdns/win32_utility.cc
+++ b/pdns/win32_utility.cc
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/pdns/ws.hh b/pdns/ws.hh
index b4c918b38514b83e22b8de79806012dbd383fcb2..a43c134551782469bcbffa5aac0b4cedcb8b8cf6 100644 (file)
--- a/pdns/ws.hh
+++ b/pdns/ws.hh
@@ -3,9 +3,9 @@
     Copyright (C) 2002  PowerDNS.COM BV
 
     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 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2
+    as published by the Free Software Foundation
+    
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of