summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsorg71 <jsorg71>2006-11-14 05:25:16 +0000
committerjsorg71 <jsorg71>2006-11-14 05:25:16 +0000
commit699a4edbcd11f4dde4898a27c703d8344cacd9bb (patch)
treea7f24cadb9f9d05f9434b6e3a86aa8c10c562605
parentdd76b40a35c1b41dc7cd75b007ced9ccf7f857d5 (diff)
downloadxrdp-proprietary-699a4edbcd11f4dde4898a27c703d8344cacd9bb.tar.gz
xrdp-proprietary-699a4edbcd11f4dde4898a27c703d8344cacd9bb.zip
update license clauses
-rw-r--r--COPYING34
1 files changed, 30 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index 43d77300..10b86d59 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,33 @@
-This software is released under the GNU General Public License
-(reproduced below) with the additional exemption that compiling,
-linking, and/or using OpenSSL together with this software is
-allowed.
+
+special clause for libxrdp and librdp, both based on rdesktop
+these libraries link to openssl
+
+ This software is released under the GNU General Public License
+ (reproduced below) with the additional exemption that compiling,
+ linking, and/or using OpenSSL together with this software is
+ allowed.
+
+---
+
+special clause for xrdp, that main executable
+for linking with proprietary modules
+
+ Linking this library statically or dynamically with other modules
+ is making a combined work based on this library. Thus, the terms
+ and conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library
+ give you permission to link this library with independent modules
+ to produce an executable, regardless of the license terms of
+ these independent modules, and to copy and distribute the resulting
+ executable under terms of your choice, provided that you also meet,
+ for each linked independent module, the terms and conditions of the
+ license of that module. An independent module is a module which is
+ not derived from or based on this library. If you modify this
+ library, you may extend this exception to your version of the
+ library, but you are not obliged to do so. If you do not wish
+ to do so, delete this exception statement from your version.
---