Bug #319778 --> use hunspell instead of myspell as the default spell check engine. patch by Ryan VanderMeulen <ryanvm@gmail.com> and Németh László <nemeth@openoffice.org> sr=mscott a=mconnor/schrep for 1.9
authorscott@scott-macgregor.org
Sun, 05 Aug 2007 20:32:58 -0700
changeset 4298 f36721c63d3d76c8de9a6c9739aaa7c425540c3f
parent 4297 4d7be8c3a84b734942cb3ef52de2423e4af61a19
child 4299 918cb8bf87da73311478f41804d059967ad45a3f
push idunknown
push userunknown
push dateunknown
reviewersmscott, mconnor, schrep
bugs319778
milestone1.9a8pre
Bug #319778 --> use hunspell instead of myspell as the default spell check engine. patch by Ryan VanderMeulen <ryanvm@gmail.com> and Németh László <nemeth@openoffice.org> sr=mscott a=mconnor/schrep for 1.9
allmakefiles.sh
editor/ui/dialogs/content/EdSpellCheck.js
extensions/spellcheck/Makefile.in
extensions/spellcheck/locales/Makefile.in
extensions/spellcheck/osxspell/Makefile.in
extensions/spellcheck/osxspell/src/Makefile.in
extensions/spellcheck/osxspell/src/mozOSXSpell.h
extensions/spellcheck/osxspell/src/mozOSXSpell.mm
extensions/spellcheck/src/Makefile.in
extensions/spellcheck/src/mozSpellChecker.cpp
extensions/spellcheck/src/mozSpellCheckerFactory.cpp
toolkit/content/license.html
xpfe/global/resources/content/license.html
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -718,19 +718,19 @@ xpfe/global/resources/content/unix/Makef
 xpfe/global/resources/locale/Makefile
 xpfe/global/resources/locale/en-US/Makefile
 xpfe/global/resources/locale/en-US/mac/Makefile
 xpfe/global/resources/locale/en-US/os2/Makefile
 xpfe/global/resources/locale/en-US/unix/Makefile
 xpfe/global/resources/locale/en-US/win/Makefile
 xpfe/communicator/Makefile
 extensions/spellcheck/Makefile
+extensions/spellcheck/hunspell/Makefile
 extensions/spellcheck/idl/Makefile
 extensions/spellcheck/locales/Makefile
-extensions/spellcheck/myspell/Makefile
 extensions/spellcheck/src/Makefile
 "
 
 MAKEFILES_embedding="
 embedding/Makefile
 embedding/base/Makefile
 embedding/browser/Makefile
 embedding/browser/activex/src/Makefile
--- a/editor/ui/dialogs/content/EdSpellCheck.js
+++ b/editor/ui/dialogs/content/EdSpellCheck.js
@@ -581,17 +581,17 @@ function ExitSpellChecker()
 {
   if (gSpellChecker)
   {
     try
     {
       var curLang = gSpellChecker.GetCurrentDictionary();
       gSpellChecker.UninitSpellChecker();
       if ("@mozilla.org/spellchecker;1" in Components.classes) {
-        var spellChecker = Components.classes["@mozilla.org/spellchecker/myspell;1"]
+        var spellChecker = Components.classes["@mozilla.org/spellchecker/hunspell;1"]
                                      .getService(Components.interfaces.mozISpellCheckingEngine);
         spellChecker.dictionary = curLang;
       }
       // now check the document over again with the new dictionary
       // if we have an inline spellchecker
       if (("InlineSpellCheckerUI" in window.opener) &&
           window.opener.InlineSpellCheckerUI.enabled)
         window.opener.InlineSpellCheckerUI.mInlineSpellChecker.spellCheckRange(null);
--- a/extensions/spellcheck/Makefile.in
+++ b/extensions/spellcheck/Makefile.in
@@ -42,14 +42,14 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= spellchecker
 DIRS		= idl locales
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DIRS		+= osxspell
 else
-DIRS		+= myspell
+DIRS		+= hunspell
 endif
 
 DIRS += src
 
 include $(topsrcdir)/config/rules.mk
--- a/extensions/spellcheck/locales/Makefile.in
+++ b/extensions/spellcheck/locales/Makefile.in
@@ -42,17 +42,17 @@ VPATH          = @srcdir@
 relativesrcdir = extensions/spellcheck/locales
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DAB_CD=$(AB_CD)
 
 include $(topsrcdir)/config/rules.mk
 
-DICTIONARY_FILES = $(strip $(wildcard $(LOCALE_SRCDIR)/myspell/*.dic) $(wildcard $(LOCALE_SRCDIR)/myspell/*.aff))
+DICTIONARY_FILES = $(strip $(wildcard $(LOCALE_SRCDIR)/hunspell/*.dic) $(wildcard $(LOCALE_SRCDIR)/hunspell/*.aff))
 
 ifneq (,$(DICTIONARY_FILES))
 libs::
 	$(INSTALL)  $(DICTIONARY_FILES) $(FINAL_TARGET)/dictionaries
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(DICTIONARY_FILES) $(DESTDIR)$(mozappdir)/dictionaries
 endif
--- a/extensions/spellcheck/osxspell/Makefile.in
+++ b/extensions/spellcheck/osxspell/Makefile.in
@@ -35,13 +35,13 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= myspell
+MODULE		= hunspell
 DIRS		= src
 
 include $(topsrcdir)/config/rules.mk
 
--- a/extensions/spellcheck/osxspell/src/Makefile.in
+++ b/extensions/spellcheck/osxspell/src/Makefile.in
@@ -35,17 +35,17 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= myspell
+MODULE		= hunspell
 LIBRARY_NAME	= osxspell_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  spellchecker \
 		  $(NULL)
--- a/extensions/spellcheck/osxspell/src/mozOSXSpell.h
+++ b/extensions/spellcheck/osxspell/src/mozOSXSpell.h
@@ -28,32 +28,32 @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * This spellchecker is based on the built-in spellchecker on Mac OS X. It
- * does not use any MySpell technology or rely on their dictionaries. It's just
+ * does not use any Hunspell technology or rely on their dictionaries. It's just
  * a thin wrapper around the Cocoa NSSpellChecker API.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef mozOSXSpell_h__
 #define mozOSXSpell_h__
 
 #include "mozISpellCheckingEngine.h"
 #include "mozIPersonalDictionary.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
 
 // use the same contract id as the MySpell spelchecker so we get picked up
 // instead on Mac OS X but we have our own CID. 
-#define MOZ_OSXSPELL_CONTRACTID "@mozilla.org/spellchecker/myspell;1"
+#define MOZ_OSXSPELL_CONTRACTID "@mozilla.org/spellchecker/hunspell;1"
 #define MOZ_OSXSPELL_CID         \
 { /* BAABBAF4-71C3-47F4-A576-E75469E485E2 */  \
 0xBAABBAF4, 0x71C3, 0x47F4,                    \
 { 0xA5, 0x76, 0xE7, 0x54, 0x69, 0xE4, 0x85, 0xE2} }
 
 class mozOSXSpell : public mozISpellCheckingEngine
 {
 public:
--- a/extensions/spellcheck/osxspell/src/mozOSXSpell.mm
+++ b/extensions/spellcheck/osxspell/src/mozOSXSpell.mm
@@ -28,17 +28,17 @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * This spellchecker is based on the built-in spellchecker on Mac OS X. It
- * does not use any MySpell technology or rely on their dictionaries. It's just
+ * does not use any Hunspell technology or rely on their dictionaries. It's just
  * a thin wrapper around the Cocoa NSSpellChecker API.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "mozOSXSpell.h"
 #include "nsReadableUtils.h"
 #include "nsCRT.h"
 
@@ -131,27 +131,27 @@ NS_IMETHODIMP mozOSXSpell::GetProvidesWo
 
   *aProvidesWordUtils = PR_FALSE;
   return NS_OK;
 }
 
 //
 // GetName
 //
-// Name not supported (nor is it in MySpell impl)
+// Name not supported (nor is it in Hunspell impl)
 //
 NS_IMETHODIMP mozOSXSpell::GetName(PRUnichar * *aName)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 //
 // GetCopyright
 //
-// Copyright not supported (nor is it in MySpell impl)
+// Copyright not supported (nor is it in Hunspell impl)
 //
 NS_IMETHODIMP mozOSXSpell::GetCopyright(PRUnichar * *aCopyright)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 //
 // GetPersonalDictionary
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -40,20 +40,20 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= spellchecker
 LIBRARY_NAME	= spellchecker
 MODULE_NAME     = mozSpellCheckerModule
-SHORT_LIBNAME = spellchk
+SHORT_LIBNAME   = spellchk
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
-LIBXUL_LIBRARY = 1
+LIBXUL_LIBRARY  = 1
 
 REQUIRES	= xpcom \
 		  string \
 		  editor \
 		  content \
 		  layout \
 		  dom \
 		  necko \
@@ -74,18 +74,18 @@ CPPSRCS		= \
 		mozInlineSpellChecker.cpp	\
 		mozInlineSpellWordUtil.cpp      \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src
 else
-SHARED_LIBRARY_LIBS += ../myspell/src/$(LIB_PREFIX)myspell_s.$(LIB_SUFFIX)
-LOCAL_INCLUDES += -I$(srcdir)/../myspell/src
+SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
+LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src
 endif
 
 EXTRA_DSO_LDOPTS = \
 		$(LIBS_DIR) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(NULL)
 
--- a/extensions/spellcheck/src/mozSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozSpellChecker.cpp
@@ -60,17 +60,17 @@ mozSpellChecker::~mozSpellChecker()
 }
 
 nsresult 
 mozSpellChecker::Init()
 {
   mPersonalDictionary = do_GetService("@mozilla.org/spellchecker/personaldictionary;1");
   
   nsresult rv;
-  mSpellCheckingEngine = do_GetService("@mozilla.org/spellchecker/myspell;1",&rv);
+  mSpellCheckingEngine = do_GetService("@mozilla.org/spellchecker/hunspell;1",&rv);
   if (NS_FAILED(rv)) {
     return rv;
   }
   mSpellCheckingEngine->SetPersonalDictionary(mPersonalDictionary);
   return NS_OK;
 } 
 
 NS_IMETHODIMP 
@@ -126,18 +126,17 @@ mozSpellChecker::NextMisspelledWord(nsAS
 NS_IMETHODIMP 
 mozSpellChecker::CheckWord(const nsAString &aWord, PRBool *aIsMisspelled, nsStringArray *aSuggestions)
 {
   nsresult result;
   PRBool correct;
   if(!mSpellCheckingEngine)
     return NS_ERROR_NULL_POINTER;
 
-  // don't bother to check crazy words, also, myspell gets unhappy if you
-  // give it too much data and crashes sometimes
+  // don't bother to check crazy words
   if (aWord.Length() > UNREASONABLE_WORD_LENGTH) {
     *aIsMisspelled = PR_TRUE;
     return NS_OK;
   }
 
   *aIsMisspelled = PR_FALSE;
   result = mSpellCheckingEngine->Check(PromiseFlatString(aWord).get(), &correct);
   NS_ENSURE_SUCCESS(result, result);
--- a/extensions/spellcheck/src/mozSpellCheckerFactory.cpp
+++ b/extensions/spellcheck/src/mozSpellCheckerFactory.cpp
@@ -9,18 +9,17 @@
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  * for the specific language governing rights and limitations under the
  * License.
  *
  * The Original Code is Mozilla Spellchecker Component.
  *
- * The Initial Developer of the Original Code is
- * David Einstein.
+ * The Initial Developer of the Original Code is David Einstein.
  * Portions created by the Initial Developer are Copyright (C) 2001
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): David Einstein <Deinst@world.std.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -36,19 +35,19 @@
  * ***** END LICENSE BLOCK ***** */
 
 
 #include "nsIGenericFactory.h"
 
 #ifdef MOZ_WIDGET_COCOA
 #include "mozOSXSpell.h"
 #else
-#include "mozMySpell.h"
+#include "mozHunspell.h"
 #ifdef MOZ_XUL_APP
-#include "mozMySpellDirProvider.h"
+#include "mozHunspellDirProvider.h"
 #endif
 #endif
 
 #include "mozSpellChecker.h"
 #include "mozInlineSpellChecker.h"
 #include "nsTextServicesCID.h"
 #include "mozPersonalDictionary.h"
 #include "mozSpellI18NManager.h"
@@ -59,27 +58,27 @@ 0x8227F019, 0xAFC7, 0x461e,             
 { 0xB0, 0x30, 0x9F, 0x18, 0x5D, 0x7A, 0x0E, 0x29} }
 
 #define MOZ_INLINESPELLCHECKER_CID         \
 { /* 9FE5D975-09BD-44aa-A01A-66402EA28657 */    \
 0x9fe5d975, 0x9bd, 0x44aa,                      \
 { 0xa0, 0x1a, 0x66, 0x40, 0x2e, 0xa2, 0x86, 0x57} }
 
 ////////////////////////////////////////////////////////////////////////
-// Define the contructor function for the objects
+// Define the constructor function for the objects
 //
 // NOTE: This creates an instance of objects by using the default constructor
 //
 
 #ifdef MOZ_WIDGET_COCOA
 NS_GENERIC_FACTORY_CONSTRUCTOR(mozOSXSpell)
 #else
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozMySpell, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozHunspell, Init)
 #ifdef MOZ_XUL_APP
-NS_GENERIC_FACTORY_CONSTRUCTOR(mozMySpellDirProvider)
+NS_GENERIC_FACTORY_CONSTRUCTOR(mozHunspellDirProvider)
 #endif
 #endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozSpellChecker, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozPersonalDictionary, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(mozSpellI18NManager)
 
 // This special constructor for the inline spell checker asks the inline
@@ -127,29 +126,29 @@ static nsModuleComponentInfo components[
     {
         "OSX Spell check service",
         MOZ_OSXSPELL_CID,
         MOZ_OSXSPELL_CONTRACTID,
         mozOSXSpellConstructor
     },
 #else
     {
-        "mozMySpell",
-        MOZ_MYSPELL_CID,
-        MOZ_MYSPELL_CONTRACTID,
-        mozMySpellConstructor
+        "mozHunspell",
+        MOZ_HUNSPELL_CID,
+        MOZ_HUNSPELL_CONTRACTID,
+        mozHunspellConstructor
     },
 #ifdef MOZ_XUL_APP
     {
-        "mozMySpellDirProvider",
-        MYSPELLDIRPROVIDER_CID,
-        mozMySpellDirProvider::kContractID,
-        mozMySpellDirProviderConstructor,
-        mozMySpellDirProvider::Register,
-        mozMySpellDirProvider::Unregister
+        "mozHunspellDirProvider",
+        HUNSPELLDIRPROVIDER_CID,
+        mozHunspellDirProvider::kContractID,
+        mozHunspellDirProviderConstructor,
+        mozHunspellDirProvider::Register,
+        mozHunspellDirProvider::Unregister
     },
 #endif // MOZ_XUL_APP
 #endif // MOZ_WIDGET_COCOA
   {
       NULL,
       NS_SPELLCHECKER_CID,
       NS_SPELLCHECKER_CONTRACTID,
       mozSpellCheckerConstructor
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -168,17 +168,16 @@
     <ul>
       <li><a href="about:license#apple-mozilla">Apple/Mozilla NPRuntime License</a></li>
       <li><a href="about:license#bspatch">bspatch License</a></li>
       <li><a href="about:license#cairo">Cairo Licenses</a></li>      
       <li><a href="about:license#expat">Expat License</a></li>
       <li><a href="about:license#growl">Growl License</a></li>
       <li><a href="about:license#jpnic">Japan Network Information Centre License</a></li>
       <li><a href="about:license#jep">Java Embedding Plugin License</a></li>
-      <li><a href="about:license#myspell">Myspell License</a></li>
       <li><a href="about:license#openvision">OpenVision License</a></li>
       <li><a href="about:license#ucal">University of California License</a></li>      
     </ul>
     
     <ul>      
       <li><a href="about:license#other-notices">Other Required Notices</a>
       <li><a href="about:license#optional-notices">Optional Notices</a>
     </ul>
@@ -2144,58 +2143,16 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIG
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </pre>
 
 
     <hr>
 
-    <h1><a name="myspell"></a>Myspell License</h1>
-
-    <p class="correctme">This license applies to certain files in the directory 
-    <span class="path">extensions/spellcheck/myspell/src/</span>.</p>
-
-<pre>
-Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
-And Contributors.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. All modifications to the source code must be clearly marked as
-   such.  Binary redistributions based on modified source code
-   must be clearly marked as modified versions in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS 
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL 
-KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-</pre>
-
-
-    <hr>
-
     <h1><a name="openvision"></a>OpenVision License</h1>
 
     <p class="correctme">This license applies to the file 
     <span class="path">extensions/auth/gssapi.h</span>.</p>
 
 <pre>
 Copyright 1993 by OpenVision Technologies, Inc.
 
--- a/xpfe/global/resources/content/license.html
+++ b/xpfe/global/resources/content/license.html
@@ -168,17 +168,16 @@
     <ul>
       <li><a href="about:license#apple-mozilla">Apple/Mozilla NPRuntime License</a></li>
       <li><a href="about:license#bspatch">bspatch License</a></li>
       <li><a href="about:license#cairo">Cairo Licenses</a></li>      
       <li><a href="about:license#expat">Expat License</a></li>
       <li><a href="about:license#growl">Growl License</a></li>
       <li><a href="about:license#jpnic">Japan Network Information Centre License</a></li>
       <li><a href="about:license#jep">Java Embedding Plugin License</a></li>
-      <li><a href="about:license#myspell">Myspell License</a></li>
       <li><a href="about:license#openvision">OpenVision License</a></li>
       <li><a href="about:license#ucal">University of California License</a></li>      
     </ul>
     
     <ul>      
       <li><a href="about:license#other-notices">Other Required Notices</a>
       <li><a href="about:license#optional-notices">Optional Notices</a>
     </ul>
@@ -2144,58 +2143,16 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIG
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </pre>
 
 
     <hr>
 
-    <h1><a name="myspell"></a>Myspell License</h1>
-
-    <p class="correctme">This license applies to certain files in the directory 
-    <span class="path">extensions/spellcheck/myspell/src/</span>.</p>
-
-<pre>
-Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
-And Contributors.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. All modifications to the source code must be clearly marked as
-   such.  Binary redistributions based on modified source code
-   must be clearly marked as modified versions in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS 
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL 
-KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-</pre>
-
-
-    <hr>
-
     <h1><a name="openvision"></a>OpenVision License</h1>
 
     <p class="correctme">This license applies to the file 
     <span class="path">extensions/auth/gssapi.h</span>.</p>
 
 <pre>
 Copyright 1993 by OpenVision Technologies, Inc.