[asterisk-commits] trunk r18574 - in /trunk: include/asterisk/module.h loader.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Sat Apr  8 17:37:30 2006
New Revision: 18574

URL: http://svn.digium.com/view/asterisk?rev=18574&view=rev
Log:
update module license key text and update loader to accept it

Modified:
    trunk/include/asterisk/module.h
    trunk/loader.c

Modified: trunk/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/module.h?rev=18574&r1=18573&r2=18574&view=diff
==============================================================================
--- trunk/include/asterisk/module.h (original)
+++ trunk/include/asterisk/module.h Sat Apr  8 17:37:30 2006
@@ -114,12 +114,17 @@
 
 /*! \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 */
 

Modified: trunk/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/loader.c?rev=18574&r1=18573&r2=18574&view=diff
==============================================================================
--- trunk/loader.c (original)
+++ trunk/loader.c Sat Apr  8 17:37:30 2006
@@ -62,8 +62,8 @@
 static int modlistver = 0; /* increase whenever the list changes, to protect reload */
 
 static unsigned char expected_key[] =
-{ 0x8e, 0x93, 0x22, 0x83, 0xf5, 0xc3, 0xc0, 0x75,
-  0xff, 0x8b, 0xa9, 0xbe, 0x7c, 0x43, 0x74, 0x63 };
+{ 0x87, 0x76, 0x79, 0x35, 0x23, 0xea, 0x3a, 0xd3,
+  0x25, 0x2a, 0xbb, 0x35, 0x87, 0xe4, 0x22, 0x24 };
 
 /*
  * Modules can be in a number of different states, as below: