From: Pieter Lexis Date: Fri, 1 Jul 2016 08:41:41 +0000 (+0200) Subject: Hopefully appease the License Gods (again) X-Git-Tag: rec-4.0.0~26^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc3c07b4745fd08d01bf20250ecb9ef5acb46890;p=thirdparty%2Fpdns.git Hopefully appease the License Gods (again) --- diff --git a/modules/gsqlite3backend/gsqlite3backend.cc b/modules/gsqlite3backend/gsqlite3backend.cc index 19a222c462..26fefb96e6 100644 --- a/modules/gsqlite3backend/gsqlite3backend.cc +++ b/modules/gsqlite3backend/gsqlite3backend.cc @@ -1,8 +1,24 @@ -// -// SQLite backend for PowerDNS -// Copyright (C) 2003, Michel Stol -// Copyright (C) 2011, PowerDNS.COM BV -// +/* SQLite backend for PowerDNS + * Copyright (C) 2003, Michel Stol + * 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 c58e262468..6de18d7f0b 100644 --- a/modules/gsqlite3backend/gsqlite3backend.hh +++ b/modules/gsqlite3backend/gsqlite3backend.hh @@ -1,8 +1,23 @@ - -// -// SQLite backend for PowerDNS -// Copyright (C) 2003, Michel Stol -// +/* SQLite backend for PowerDNS + * Copyright (C) 2003, Michel Stol + * + * 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 d6000427f3..5d69166e0d 100644 --- 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 8f04b6a076..309cfb0691 100644 --- 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 ec99c7f7fc..bb0b19a520 100644 --- 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 1c062479f8..f2157d0474 100644 --- 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 51b857f7c3..487030e914 100644 --- 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 f048614cd0..5e99919183 100644 --- 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 732f590c0c..7f3c9b152e 100644 --- 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 6a74ab13b2..d3b808681a 100644 --- 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 c0be491211..3334be8d11 100644 --- 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 2d0160a8ee..515d1617db 100644 --- 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 58dab55c13..377371988d 100644 --- 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 e26e2b5073..34d02932be 100644 --- 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 #include "namespaces.hh" #include "misc.hh" diff --git a/pdns/ssqlite3.cc b/pdns/ssqlite3.cc index bcf07a10d8..9c275688fd 100644 --- a/pdns/ssqlite3.cc +++ b/pdns/ssqlite3.cc @@ -1,8 +1,23 @@ - -// -// SQLite backend for PowerDNS -// Copyright (C) 2003, Michel Stol -// +/* SQLite backend for PowerDNS + * Copyright (C) 2003, Michel Stol + * + * 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 34288a04a1..ac744bbe55 100644 --- a/pdns/ssqlite3.hh +++ b/pdns/ssqlite3.hh @@ -1,8 +1,23 @@ - -// -// SQLite backend for PowerDNS -// Copyright (C) 2003, Michel Stol -// +/* SQLite backend for PowerDNS + * Copyright (C) 2003, Michel Stol + * + * 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 061a406979..208cecb48a 100644 --- 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