URL: https://github.com/freeipa/freeipa/pull/2236 Author: abbra Title: #2236: ipa-extdom-extop: Update licenses to GPLv3 or later with exceptions Action: opened
PR body: """ The code in question was supposed to have the same license as the rest of the plugin. Fix it by updating the comment header. Signed-off-by: Alexander Bokovoy <aboko...@redhat.com> """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2236/head:pr2236 git checkout pr2236
From 2f5b64f943e8a14f65d6dfb7419b43401adc3107 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy <aboko...@redhat.com> Date: Fri, 10 Aug 2018 14:27:21 +0300 Subject: [PATCH] ipa-extdom-extop: Update licenses to GPLv3 or later with exceptions The code in question was supposed to have the same license as the rest of the plugin. Fix it by updating the comment header. Signed-off-by: Alexander Bokovoy <aboko...@redhat.com> --- .../ipa-extdom-extop/back_extdom_nss_sss.c | 43 +++++++++++++------ .../ipa-extdom-extop/back_extdom_sss_idmap.c | 43 +++++++++++++------ 2 files changed, 58 insertions(+), 28 deletions(-) diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/back_extdom_nss_sss.c b/daemons/ipa-slapi-plugins/ipa-extdom-extop/back_extdom_nss_sss.c index 346c7d4301..55b1030403 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/back_extdom_nss_sss.c +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/back_extdom_nss_sss.c @@ -1,23 +1,38 @@ -/* - * Copyright 2013-2017 Red Hat, Inc. - * - * This Program is free software; you can redistribute it and/or modify +/** BEGIN COPYRIGHT BLOCK + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This Program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this Program; if not, write to the + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Additional permission under GPLv3 section 7: + * + * In the following paragraph, "GPL" means the GNU General Public + * License, version 3 or any later version, and "Non-GPL Code" means + * code that is governed neither by the GPL nor a license + * compatible with the GPL. * - * Free Software Foundation, Inc. - * 59 Temple Place, Suite 330 - * Boston, MA 02111-1307 USA + * You may link the code of this Program with Non-GPL Code and convey + * linked combinations including the two, provided that such Non-GPL + * Code only links to the code of this Program through those well + * defined interfaces identified in the file named EXCEPTION found in + * the source code files (the "Approved Interfaces"). The files of + * Non-GPL Code may instantiate templates or use macros or inline + * functions from the Approved Interfaces without causing the resulting + * work to be covered by the GPL. Only the copyright holders of this + * Program may make changes or additions to the list of Approved + * Interfaces. * - */ + * Copyright (C) 2013-2017 Red Hat, Inc. + * All rights reserved. + * END COPYRIGHT BLOCK **/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/back_extdom_sss_idmap.c b/daemons/ipa-slapi-plugins/ipa-extdom-extop/back_extdom_sss_idmap.c index 89c58ca2de..ef552a9a37 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/back_extdom_sss_idmap.c +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/back_extdom_sss_idmap.c @@ -1,23 +1,38 @@ -/* - * Copyright 2013-2017 Red Hat, Inc. - * - * This Program is free software; you can redistribute it and/or modify +/** BEGIN COPYRIGHT BLOCK + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This Program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this Program; if not, write to the + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Additional permission under GPLv3 section 7: + * + * In the following paragraph, "GPL" means the GNU General Public + * License, version 3 or any later version, and "Non-GPL Code" means + * code that is governed neither by the GPL nor a license + * compatible with the GPL. * - * Free Software Foundation, Inc. - * 59 Temple Place, Suite 330 - * Boston, MA 02111-1307 USA + * You may link the code of this Program with Non-GPL Code and convey + * linked combinations including the two, provided that such Non-GPL + * Code only links to the code of this Program through those well + * defined interfaces identified in the file named EXCEPTION found in + * the source code files (the "Approved Interfaces"). The files of + * Non-GPL Code may instantiate templates or use macros or inline + * functions from the Approved Interfaces without causing the resulting + * work to be covered by the GPL. Only the copyright holders of this + * Program may make changes or additions to the list of Approved + * Interfaces. * - */ + * Copyright (C) 2013-2017 Red Hat, Inc. + * All rights reserved. + * END COPYRIGHT BLOCK **/ #ifdef HAVE_CONFIG_H #include "config.h"
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/freeipa-devel@lists.fedorahosted.org/message/NOWGRKK5LW7HXL7LKJ5UAZWYPN5WBLNW/
