aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2012-03-29 09:29:43 +0200
committerDan Gudmundsson <[email protected]>2012-03-29 09:29:58 +0200
commit472a3d910595d7de1e49f241c1d241827b5c0bf4 (patch)
tree6a8af070bf98697cd0e08823722176c72beffbc7 /system
parentccc9e16381244760b3013e11b6fe8f1fe2a0a809 (diff)
parent1ff967c2a574161aef4c88177da534b45d9ebd80 (diff)
downloadotp-472a3d910595d7de1e49f241c1d241827b5c0bf4.tar.gz
otp-472a3d910595d7de1e49f241c1d241827b5c0bf4.tar.bz2
otp-472a3d910595d7de1e49f241c1d241827b5c0bf4.zip
Merge branch 'dgud/eldap' into maint
* dgud/eldap: [eldap] Fix parse_port error handling [eldap] Add rudimentary docs [eldap] Add asn.1 compilation options [eldap] Add dereference options in search [eldap] Remove broken functionality [eldap] Add infrastructure [eldap] Initial copy of Tobbe's eldap client OTP-10034
Diffstat (limited to 'system')
-rw-r--r--system/COPYRIGHT23
1 files changed, 23 insertions, 0 deletions
diff --git a/system/COPYRIGHT b/system/COPYRIGHT
index 94e9795b16..c6b7d8b64f 100644
--- a/system/COPYRIGHT
+++ b/system/COPYRIGHT
@@ -245,3 +245,26 @@ terms specified in this license.
%% POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------
+[eldap]
+
+Copyright (c) 2010, Torbjorn Tornkvist
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+---------------------------------------------------------------------------