Bug 236613: change to MPL/LGPL/GPL tri-license.

1 files changed, 35 insertions, 30 deletions

diff --git a/security/nss/cmd/addbuiltin/addbuiltin.c b/security/nss/cmd/addbuiltin/addbuiltin.c
index 16a130695..291828351 100644
--- a/security/nss/cmd/addbuiltin/addbuiltin.c
+++ b/security/nss/cmd/addbuiltin/addbuiltin.c
@@ -175,36 +175,41 @@ ConvertCertificate(SECItem *sdder, char *nickname, CERTCertTrust *trust)
 
 printheader() {
     printf("# \n"
-     "# The contents of this file are subject to the Mozilla Public\n"
-     "# License Version 1.1 (the \"License\"); you may not use this file\n"
-     "# except in compliance with the License. You may obtain a copy of\n"
-     "# the License at http://www.mozilla.org/MPL/\n"
-     "# \n"
-     "# Software distributed under the License is distributed on an \"AS\n"
-     "# IS\" basis, WITHOUT WARRANTY OF ANY KIND, either express or\n"
-     "# implied. See the License for the specific language governing\n"
-     "# rights and limitations under the License.\n"
-     "# \n"
-     "# The Original Code is the Netscape security libraries.\n"
-     "# \n"
-     "# The Initial Developer of the Original Code is Netscape\n"
-     "# Communications Corporation.  Portions created by Netscape are \n"
-     "# Copyright (C) 1994-2000 Netscape Communications Corporation.  All\n"
-     "# Rights Reserved.\n"
-     "# \n"
-     "# Contributor(s):\n"
-     "# \n"
-     "# Alternatively, the contents of this file may be used under the\n"
-     "# terms of the GNU General Public License Version 2 or later (the\n"
-     "# \"GPL\"), in which case the provisions of the GPL are applicable \n"
-     "# instead of those above.  If you wish to allow use of your \n"
-     "# version of this file only under the terms of the GPL and not to\n"
-     "# allow others to use your version of this file under the MPL,\n"
-     "# indicate your decision by deleting the provisions above and\n"
-     "# replace them with the notice and other provisions required by\n"
-     "# the GPL.  If you do not delete the provisions above, a recipient\n"
-     "# may use your version of this file under either the MPL or the\n"
-     "# GPL.\n"
+"# ***** BEGIN LICENSE BLOCK *****\n"
+"# Version: MPL 1.1/GPL 2.0/LGPL 2.1\n"
+"#\n"
+"# The contents of this file are subject to the Mozilla Public License Version\n"
+"# 1.1 (the \"License\"); you may not use this file except in compliance with\n"
+"# the License. You may obtain a copy of the License at\n"
+"# http://www.mozilla.org/MPL/\n"
+"#\n"
+"# Software distributed under the License is distributed on an \"AS IS\" basis,\n"
+"# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License\n"
+"# for the specific language governing rights and limitations under the\n"
+"# License.\n"
+"#\n"
+"# The Original Code is the Netscape security libraries..\n"
+"#\n"
+"# The Initial Developer of the Original Code is\n"
+"# Netscape Communications Corporation.\n"
+"# Portions created by the Initial Developer are Copyright (C) 1994-2000\n"
+"# the Initial Developer. All Rights Reserved.\n"
+"#\n"
+"# Contributor(s):\n"
+"#\n"
+"# Alternatively, the contents of this file may be used under the terms of\n"
+"# either the GNU General Public License Version 2 or later (the \"GPL\"), or\n"
+"# the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"),\n"
+"# in which case the provisions of the GPL or the LGPL are applicable instead\n"
+"# of those above. If you wish to allow use of your version of this file only\n"
+"# under the terms of either the GPL or the LGPL, and not to allow others to\n"
+"# use your version of this file under the terms of the MPL, indicate your\n"
+"# decision by deleting the provisions above and replace them with the notice\n"
+"# and other provisions required by the GPL or the LGPL. If you do not delete\n"
+"# the provisions above, a recipient may use your version of this file under\n"
+"# the terms of any one of the MPL, the GPL or the LGPL.\n"
+"#\n"
+"# ***** END LICENSE BLOCK *****\n"
      "#\n"
      "CVS_ID \"@(#) $RCSfile$ $Revision$ $Date$\"\n"
      "\n"