From 34624c527c45e52ac3adcb72715cdf8602ab94e1 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Sat, 8 Apr 2006 22:37:30 +0000 Subject: update module license key text and update loader to accept it git-svn-id: http://svn.digium.com/svn/asterisk/trunk@18574 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/module.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/asterisk/module.h b/include/asterisk/module.h index 1f9d078bc..5447a614d 100644 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -114,12 +114,17 @@ int reload(void); /* reload configs */ /*! \brief The text the key() function should return. */ #define ASTERISK_GPL_KEY \ - "This paragraph is Copyright (C) 2000, Linux Support Services, Inc. \ -In order for your module to load, it must return this key via a function \ -called \"key\". Any code which includes this paragraph must be licensed under \ -the GNU General Public License version 2 or later (at your option). Linux \ -Support Services, Inc. reserves the right to allow other parties to license \ -this paragraph under other terms as well." +"This paragraph is copyright (c) 2006 by Digium, Inc. \ +In order for your module to load, it must return this \ +key via a function called \"key\". Any code which \ +includes this paragraph must be licensed under the GNU \ +General Public License version 2 or later (at your \ +option). In addition to Digium's general reservations \ +of rights, Digium expressly reserves the right to \ +allow other parties to license this paragraph under \ +different terms. Any use of Digium, Inc. trademarks or \ +logos (including \"Asterisk\" or \"Digium\") without \ +express written permission of Digium, Inc. is prohibited.\n" #define AST_MODULE_CONFIG "modules.conf" /*!< \brief Module configuration file */ -- cgit v1.2.3