Hopefully appease the License Gods (again)

diff --git a/modules/gsqlite3backend/gsqlite3backend.cc b/modules/gsqlite3backend/gsqlite3backend.cc
index 19a222c462f985114f4d2b936d5ccb7e973f6a30..26fefb96e6e68b1c6006b6f29919ccec96c088dc 100644 (file)
--- a/modules/gsqlite3backend/gsqlite3backend.cc
+++ b/modules/gsqlite3backend/gsqlite3backend.cc
@@ -1,8 +1,24 @@
-//
-// SQLite backend for PowerDNS
-// Copyright (C) 2003, Michel Stol <michel@powerdns.com>
-// Copyright (C) 2011, PowerDNS.COM BV
-//
+/*  SQLite backend for PowerDNS
+ *  Copyright (C) 2003, Michel Stol <michel@powerdns.com>
+ *  Copyright (C) 2011, 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.
+ *
+ *  Additionally, the license of this program contains a special
+ *  exception which allows to distribute the program in binary form when
+ *  it is linked against OpenSSL.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/modules/gsqlite3backend/gsqlite3backend.hh b/modules/gsqlite3backend/gsqlite3backend.hh
index c58e2624687468280eff0b2cb3cb3750d74cf9ac..6de18d7f0b67ac0f595fca5485dceffb61b8b7b8 100644 (file)
--- a/modules/gsqlite3backend/gsqlite3backend.hh
+++ b/modules/gsqlite3backend/gsqlite3backend.hh
@@ -1,8 +1,23 @@
-
-//
-// SQLite backend for PowerDNS
-// Copyright (C) 2003, Michel Stol <michel@powerdns.com>
-//
+/*  SQLite backend for PowerDNS
+ *  Copyright (C) 2003, Michel Stol <michel@powerdns.com>
+ *
+ *  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.
+ *
+ *  Additionally, the license of this program contains a special
+ *  exception which allows to distribute the program in binary form when
+ *  it is linked against OpenSSL.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #ifndef GSQLITEBACKEND_HH
 #define GSQLITEBACKEND_HH

diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh
index d6000427f36b48e93a336906317bc275b52ebac8..5d69166e0d611e683bb1a3f5bfe155420067a141 100644 (file)
--- a/modules/ldapbackend/ldapbackend.hh
+++ b/modules/ldapbackend/ldapbackend.hh
@@ -6,6 +6,10 @@
  *  it under the terms of the GNU General Public License version 2
  *  as published by the Free Software Foundation.
  *
+ *  Additionally, the license of this program contains a special
+ *  exception which allows to distribute the program in binary form when
+ *  it is linked against OpenSSL.
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/luabackend/dnssec.cc b/modules/luabackend/dnssec.cc
index 8f04b6a0768c16500caf7a006c7777ca326ae6d6..309cfb0691cab7a87d863d626326d1f4808e9df9 100644 (file)
--- a/modules/luabackend/dnssec.cc
+++ b/modules/luabackend/dnssec.cc
@@ -5,6 +5,10 @@
     it under the terms of the GNU General Public License version 2 as published 
     by the Free Software Foundation
 
+    Additionally, the license of this program contains a special
+    exception which allows to distribute the program in binary form when
+    it is linked against OpenSSL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/luabackend/lua_functions.cc b/modules/luabackend/lua_functions.cc
index ec99c7f7fc3d3e25062804f4f4544a822fcd7e43..bb0b19a520da4391bd4666979caa25d98f699884 100644 (file)
--- a/modules/luabackend/lua_functions.cc
+++ b/modules/luabackend/lua_functions.cc
@@ -5,6 +5,10 @@
     it under the terms of the GNU General Public License version 2 as published
     by the Free Software Foundation
 
+    Additionally, the license of this program contains a special
+    exception which allows to distribute the program in binary form when
+    it is linked against OpenSSL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/luabackend/luabackend.cc b/modules/luabackend/luabackend.cc
index 1c062479f80bd0c2862569f70beeb0cdb4285205..f2157d0474dcf3f3a1af5b4a6bccc179adc5f1af 100644 (file)
--- a/modules/luabackend/luabackend.cc
+++ b/modules/luabackend/luabackend.cc
@@ -5,6 +5,10 @@
     it under the terms of the GNU General Public License version 2 as published 
     by the Free Software Foundation
 
+    Additionally, the license of this program contains a special
+    exception which allows to distribute the program in binary form when
+    it is linked against OpenSSL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/luabackend/master.cc b/modules/luabackend/master.cc
index 51b857f7c35c5301af16c852b457bcb00a863207..487030e91489649f0a62a8a5ec35ca935ba25778 100644 (file)
--- a/modules/luabackend/master.cc
+++ b/modules/luabackend/master.cc
@@ -5,6 +5,10 @@
     it under the terms of the GNU General Public License version 2 as published 
     by the Free Software Foundation
 
+    Additionally, the license of this program contains a special
+    exception which allows to distribute the program in binary form when
+    it is linked against OpenSSL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/luabackend/minimal.cc b/modules/luabackend/minimal.cc
index f048614cd045d3dde680b085333cb1b100a2789a..5e9991918348dc8d79d85b36539616986ef900a5 100644 (file)
--- a/modules/luabackend/minimal.cc
+++ b/modules/luabackend/minimal.cc
@@ -5,6 +5,10 @@
     it under the terms of the GNU General Public License version 2 as published
     by the Free Software Foundation
 
+    Additionally, the license of this program contains a special
+    exception which allows to distribute the program in binary form when
+    it is linked against OpenSSL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/luabackend/private.cc b/modules/luabackend/private.cc
index 732f590c0cc56eaf7ed42e6170770138d649eed6..7f3c9b152e702f00bf82c0d1bfce1aa841055712 100644 (file)
--- a/modules/luabackend/private.cc
+++ b/modules/luabackend/private.cc
@@ -5,6 +5,10 @@
     it under the terms of the GNU General Public License version 2 as published 
     by the Free Software Foundation
 
+    Additionally, the license of this program contains a special
+    exception which allows to distribute the program in binary form when
+    it is linked against OpenSSL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/luabackend/reload.cc b/modules/luabackend/reload.cc
index 6a74ab13b2da59c0772346bc842100f2e219cdca..d3b808681a9b97190a3fcafd68c81cfea032bbef 100644 (file)
--- a/modules/luabackend/reload.cc
+++ b/modules/luabackend/reload.cc
@@ -5,6 +5,10 @@
     it under the terms of the GNU General Public License version 2 as published 
     by the Free Software Foundation
 
+    Additionally, the license of this program contains a special
+    exception which allows to distribute the program in binary form when
+    it is linked against OpenSSL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/luabackend/slave.cc b/modules/luabackend/slave.cc
index c0be49121151f9594cf83ac28d42b0ba713447b5..3334be8d11279d1871111f07172092abc48e25d0 100644 (file)
--- a/modules/luabackend/slave.cc
+++ b/modules/luabackend/slave.cc
@@ -5,6 +5,10 @@
     it under the terms of the GNU General Public License version 2 as published 
     by the Free Software Foundation
 
+    Additionally, the license of this program contains a special
+    exception which allows to distribute the program in binary form when
+    it is linked against OpenSSL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/luabackend/supermaster.cc b/modules/luabackend/supermaster.cc
index 2d0160a8ee8644e9af4659ba2e5f0115b84d00a5..515d1617db17753d43dc7d70705c8f1d6d079b49 100644 (file)
--- a/modules/luabackend/supermaster.cc
+++ b/modules/luabackend/supermaster.cc
@@ -5,6 +5,10 @@
     it under the terms of the GNU General Public License version 2 as published 
     by the Free Software Foundation
 
+    Additionally, the license of this program contains a special
+    exception which allows to distribute the program in binary form when
+    it is linked against OpenSSL.
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/modules/opendbxbackend/odbxbackend.hh b/modules/opendbxbackend/odbxbackend.hh
index 58dab55c139cb09777cdbc737d2e86b1d426e060..377371988d9956ed91671ac62bc07efd36f974e8 100644 (file)
--- a/modules/opendbxbackend/odbxbackend.hh
+++ b/modules/opendbxbackend/odbxbackend.hh
@@ -6,6 +6,10 @@
  *  it under the terms of the GNU General Public License version 2
  *  as published by the Free Software Foundation
  *
+ *  Additionally, the license of this program contains a special
+ *  exception which allows to distribute the program in binary form when
+ *  it is linked against OpenSSL.
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

diff --git a/pdns/sodcrypto.cc b/pdns/sodcrypto.cc
index e26e2b50739784fe879007638baca15e6b776a83..34d02932be02e7cc87974d6192f77279e743fd7c 100644 (file)
--- a/pdns/sodcrypto.cc
+++ b/pdns/sodcrypto.cc
@@ -1,3 +1,23 @@
+/*  Copyright (C) 2016 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.
+ *
+ *  Additionally, the license of this program contains a special
+ *  exception which allows to distribute the program in binary form when
+ *  it is linked against OpenSSL.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 #include <iostream>
 #include "namespaces.hh"
 #include "misc.hh"

diff --git a/pdns/ssqlite3.cc b/pdns/ssqlite3.cc
index bcf07a10d84daac89375c9ccbf3faa1473ad3a13..9c275688fd86cd4d33b61e2a4783b9d5526340d4 100644 (file)
--- a/pdns/ssqlite3.cc
+++ b/pdns/ssqlite3.cc
@@ -1,8 +1,23 @@
-
-//
-// SQLite backend for PowerDNS
-// Copyright (C) 2003, Michel Stol <michel@powerdns.com>
-//
+/*  SQLite backend for PowerDNS
+ *  Copyright (C) 2003, Michel Stol <michel@powerdns.com>
+ *
+ *  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.
+ *
+ *  Additionally, the license of this program contains a special
+ *  exception which allows to distribute the program in binary form when
+ *  it is linked against OpenSSL.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/pdns/ssqlite3.hh b/pdns/ssqlite3.hh
index 34288a04a198d8ca6b3dd1951de8cf19e391800f..ac744bbe55d0769414e1225cb3f7044df0b57fa6 100644 (file)
--- a/pdns/ssqlite3.hh
+++ b/pdns/ssqlite3.hh
@@ -1,8 +1,23 @@
-
-//
-// SQLite backend for PowerDNS
-// Copyright (C) 2003, Michel Stol <michel@powerdns.com>
-//
+/*  SQLite backend for PowerDNS
+ *  Copyright (C) 2003, Michel Stol <michel@powerdns.com>
+ *
+ *  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.
+ *
+ *  Additionally, the license of this program contains a special
+ *  exception which allows to distribute the program in binary form when
+ *  it is linked against OpenSSL.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #ifndef SSQLITE3_HH
 #define SSQLITE3_HH

diff --git a/pdns/zone2ldap.cc b/pdns/zone2ldap.cc
index 061a406979182d644e18fdce8f4370b941f20c45..208cecb48a36daa3f02f05c9c2239bfa4814b98f 100644 (file)
--- a/pdns/zone2ldap.cc
+++ b/pdns/zone2ldap.cc
@@ -6,7 +6,10 @@
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
  *  the Free Software Foundation
- *  
+ *
+ *  Additionally, the license of this program contains a special
+ *  exception which allows to distribute the program in binary form when
+ *  it is linked against OpenSSL.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of