Skip to content

Commit

Permalink
Move information in COPYING to LICENSE and remove COPYING.
Browse files Browse the repository at this point in the history
Also, rearrange copyright years.

Also also, state NORDUnet as being the provider of the software in the
BSD license.
  • Loading branch information
Linus Nordberg committed Sep 14, 2012
1 parent db965c9 commit 6bec43d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
3 changes: 0 additions & 3 deletions COPYING

This file was deleted.

16 changes: 9 additions & 7 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ Public License Version 2 or later (GPL).
Alternatively the radsecproxy source code is subject to the terms of the
below BSD style license.

* Copyright (c) 2006-2010, UNINETT AS
* Copyright (c) 2010,2011, NORDUnet A/S
* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
* Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
* Copyright (c) 2010-2012, NORDUnet A/S.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand All @@ -18,14 +19,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
Expand Down

0 comments on commit 6bec43d

Please sign in to comment.