50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
commit d762f61d25508c1856c0fa7dc0ea1e032671542b
|
|
Author: Simo Sorce <simo@redhat.com>
|
|
Date: Fri Feb 20 08:46:40 2015 -0500
|
|
|
|
Add a clear OpenSSL exception.
|
|
|
|
We are linking with OpenSSL in 2 files, so make it clear we intentionally
|
|
add a GPLv3 exception to allow that linking by third parties.
|
|
|
|
Signed-off-by: Simo Sorce <simo@redhat.com>
|
|
Reviewed-By: Nathaniel McCallum <npmccallum@redhat.com>
|
|
|
|
diff --git a/COPYING.openssl b/COPYING.openssl
|
|
new file mode 100644
|
|
index 0000000..8a92460
|
|
--- /dev/null
|
|
+++ b/COPYING.openssl
|
|
@@ -0,0 +1,16 @@
|
|
+ADDITIONAL PERMISSIONS
|
|
+
|
|
+This file is a modification of the main license file (COPYING), which
|
|
+contains the license terms. It applies only to specific files in the
|
|
+tree that include an "OpenSSL license exception" disclaimer.
|
|
+
|
|
+In addition to the governing license (GPLv3), as a special exception,
|
|
+the copyright holders give permission to link the code of this program
|
|
+with the OpenSSL library, and distribute linked combinations including
|
|
+the two.
|
|
+You must obey the GNU General Public License in all respects for all of
|
|
+the code used other than OpenSSL. If you modify file(s) with this
|
|
+exception, you may extend this exception to your version of the file(s),
|
|
+but you are not obligated to do so. If you do not wish to do so, delete
|
|
+this exception statement from your version. If you delete the exception
|
|
+statement from all source files in the program, then also delete it here.
|
|
diff --git a/util/ipa_pwd_ntlm.c b/util/ipa_pwd_ntlm.c
|
|
index 8ffa666..c6abd4b 100644
|
|
--- a/util/ipa_pwd_ntlm.c
|
|
+++ b/util/ipa_pwd_ntlm.c
|
|
@@ -18,6 +18,10 @@
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
+ *
|
|
+ * This file includes an "OpenSSL license exception", see the
|
|
+ * COPYING.openssl file for details.
|
|
+ *
|
|
*/
|
|
|
|
#include <stdbool.h>
|