From 70ef5a4310268c1264f116efdc70a60c0a0dbb4d Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 7 Aug 2012 12:23:17 +0200 Subject: Clarified alternative licensing to GPLv2+. --- src/check.c | 6 ++---- src/error.c | 6 ++---- src/generate.c | 6 ++---- src/pam_pwquality.c | 6 ++---- src/pwmake.c | 6 ++---- src/pwqprivate.h | 6 ++---- src/pwquality.h | 6 ++---- src/pwscore.c | 6 ++---- src/settings.c | 6 ++---- 9 files changed, 18 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/check.c b/src/check.c index f72c351..35975a7 100644 --- a/src/check.c +++ b/src/check.c @@ -695,10 +695,8 @@ pwquality_check(pwquality_settings_t *pwq, const char *password, * written permission. * * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) + * the GNU General Public License version 2 or later, in which case the + * provisions of the GPL are required INSTEAD OF the above restrictions. * * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/src/error.c b/src/error.c index 4928097..4376348 100644 --- a/src/error.c +++ b/src/error.c @@ -173,10 +173,8 @@ pwquality_strerror(char *buf, size_t len, int rv, void *auxerror) * written permission. * * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) + * the GNU General Public License version 2 or later, in which case the + * provisions of the GPL are required INSTEAD OF the above restrictions. * * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/src/generate.c b/src/generate.c index 50d3b52..0b83b97 100644 --- a/src/generate.c +++ b/src/generate.c @@ -192,10 +192,8 @@ pwquality_generate(pwquality_settings_t *pwq, int entropy_bits, char **password) * written permission. * * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) + * the GNU General Public License version 2 or later, in which case the + * provisions of the GPL are required INSTEAD OF the above restrictions. * * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/src/pam_pwquality.c b/src/pam_pwquality.c index 52535c9..0a5bd12 100644 --- a/src/pam_pwquality.c +++ b/src/pam_pwquality.c @@ -255,10 +255,8 @@ struct pam_module _pam_pwquality_modstruct = { * written permission. * * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) + * the GNU General Public License version 2 or later, in which case the + * provisions of the GPL are required INSTEAD OF the above restrictions. * * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/src/pwmake.c b/src/pwmake.c index 6e50ea7..3372169 100644 --- a/src/pwmake.c +++ b/src/pwmake.c @@ -85,10 +85,8 @@ main(int argc, char *argv[]) * written permission. * * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) + * the GNU General Public License version 2 or later, in which case the + * provisions of the GPL are required INSTEAD OF the above restrictions. * * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/src/pwqprivate.h b/src/pwqprivate.h index 0e3df81..fa89baf 100644 --- a/src/pwqprivate.h +++ b/src/pwqprivate.h @@ -72,10 +72,8 @@ struct setting_mapping { * written permission. * * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) + * the GNU General Public License version 2 or later, in which case the + * provisions of the GPL are required INSTEAD OF the above restrictions. * * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/src/pwquality.h b/src/pwquality.h index 1657ca1..c7a116d 100644 --- a/src/pwquality.h +++ b/src/pwquality.h @@ -149,10 +149,8 @@ pwquality_strerror(char *buf, size_t len, int errcode, void *auxerror); * written permission. * * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) + * the GNU General Public License version 2 or later, in which case the + * provisions of the GPL are required INSTEAD OF the above restrictions. * * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/src/pwscore.c b/src/pwscore.c index 68e8722..f3a9210 100644 --- a/src/pwscore.c +++ b/src/pwscore.c @@ -95,10 +95,8 @@ main(int argc, char *argv[]) * written permission. * * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) + * the GNU General Public License version 2 or later, in which case the + * provisions of the GPL are required INSTEAD OF the above restrictions. * * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/src/settings.c b/src/settings.c index 9ba3e62..519dbda 100644 --- a/src/settings.c +++ b/src/settings.c @@ -363,10 +363,8 @@ pwquality_get_str_value(pwquality_settings_t *pwq, int setting, const char **val * written permission. * * ALTERNATIVELY, this product may be distributed under the terms of - * the GNU Public License, in which case the provisions of the GPL are - * required INSTEAD OF the above restrictions. (This clause is - * necessary due to a potential bad interaction between the GPL and - * the restrictions contained in a BSD-style copyright.) + * the GNU General Public License version 2 or later, in which case the + * provisions of the GPL are required INSTEAD OF the above restrictions. * * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -- cgit v1.2.1