Skip to content

Commit 0e6ae34

Browse files
committed
Relicense under the MIT license rather than BSD-2-Clause
1 parent b0d86a9 commit 0e6ae34

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

LICENSE

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
Copyright (c) 2016, South African Identity Federation (SAFIRE)
2-
All rights reserved.
1+
Copyright (c) 2016, SAFIRE - South African Identity Federation
32

4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are met:
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
69

7-
* Redistributions of source code must retain the above copyright notice, this
8-
list of conditions and the following disclaimer.
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
912

10-
* Redistributions in binary form must reproduce the above copyright notice,
11-
this list of conditions and the following disclaimer in the documentation
12-
and/or other materials provided with the distribution.
13-
14-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
15-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
18-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
20-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
21-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
22-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"name": "safire-ac-za/simplesamlphp-module-sqlattribs",
33
"description": "SimpleSAMLphp module to provide additional attributes from a SQL database",
44
"type": "simplesamlphp-module",
5-
"license": "BSD-2-Clause",
5+
"license": "MIT",
66
"authors": [
77
{
8-
"name": "Guy Antony Halse"
8+
"name": "Guy Halse",
9+
"homepage": "http://orcid.org/0000-0002-9388-8592"
910
}
1011
],
1112
"require": {

lib/Auth/Process/AttributeFromSQL.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
*
66
* This filter allows you to add attributes from a SQL datasource
77
*
8-
* @author Guy Halse
8+
* @author Guy Halse http://orcid.org/0000-0002-9388-8592
9+
* @copyright Copyright (c) 2016, SAFIRE - South African Identity Federation
10+
* @license https://github.com/safire-ac-za/simplesamlphp-module-sqlattribs/blob/master/LICENSE MIT License
911
* @package SimpleSAMLphp
1012
*/
1113
class sspmod_sqlattribs_Auth_Process_AttributeFromSQL extends SimpleSAML_Auth_ProcessingFilter

0 commit comments

Comments
 (0)