diff options
| author | Linus Nordberg <linus@nordu.net> | 2012-09-14 10:32:53 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2012-10-30 11:43:42 +0100 |
| commit | 8c8a1423c3d407bd119b75aae93386bbfd0176e2 (patch) | |
| tree | 32cf819602b0d3da5ba0bcb0758a88636b16a2e5 /LICENSE | |
| parent | 7c623adb88bca75fbdac6b6d34bfa069a58ee696 (diff) | |
| parent | 9142e68885bb6d19f0f6d44c4d8daf5ae4d12cbe (diff) | |
Merge branch 'licensing-nogpl'
Conflicts:
configure.ac
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 22 |
1 files changed, 8 insertions, 14 deletions
@@ -1,14 +1,7 @@ -The radsecproxy source code is subject to two licenses, you may pick -the one that best suits your needs. - -The radsecproxy source code is subject to the terms of the GNU General -Public License Version 2 or later (GPL). - -Alternatively the radsecproxy source code is subject to the terms of the -below BSD style license. +Radsecproxy is distributed under this license: * Copyright (c) 2006-2010, UNINETT AS -* Copyright (c) 2010,2011, NORDUnet A/S +* Copyright (c) 2010-2012, NORDUnet A/S * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -18,14 +11,15 @@ below BSD style license. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with distribution. -* * Neither the name of the UNINETT AS nor the names of its -* contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. +* * Neither the name of NORDUnet A/S nor the names of its +* contributors may be used to endorse or promote products +* derived from this software without specific prior written +* permission. * -* THIS SOFTWARE IS PROVIDED BY UNINETT AS ``AS IS'' AND ANY +* THIS SOFTWARE IS PROVIDED BY NORDUNET AS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL UNINETT AS BE LIABLE FOR ANY +* DISCLAIMED. IN NO EVENT SHALL NORDUNET AS BE LIABLE FOR ANY * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |