copyright notice updates

Update copyright.texinfo.  Move full copyright notices to appendices
of documentation.  New rules to generate top-level NOTICE file from
copyright.texinfo.  Regenerate NOTICE file.

ticket: 6802
tags: pullup
target_version: 1.9

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24455 dc483132-0cff-0310-8789-dd5450dbe970

8 files changed, 1541 insertions, 482 deletions

diff --git a/NOTICE b/NOTICE
index 0bf5a7dda2..525f9709d0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,55 +2,95 @@ Copyright (C) 1985-2010 by the Massachusetts Institute of Technology.
 
 All rights reserved.
 
-Export of this software from the United States of America may require
-a specific license from the United States Government.  It is the
-responsibility of any person or organization contemplating export to
-obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  Furthermore if you modify this software you must label
-your software as modified software and not distribute it in such a
-fashion that it might be confused with the original MIT software.
-M.I.T. makes no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied
-warranty.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-Individual source code files are copyright MIT, Cygnus Support,
-Novell, OpenVision Technologies, Oracle, Red Hat, Sun Microsystems,
+  Export of software employing encryption from the United States of
+  America may require a specific license from the United States
+  Government.  It is the responsibility of any person or organization
+  contemplating export to obtain such a license before exporting.
+
+WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute
+this software and its documentation for any purpose and without fee is
+hereby granted, provided that the above copyright notice appear in all
+copies and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of M.I.T. not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  Furthermore if you
+modify this software you must label your software as modified software
+and not distribute it in such a fashion that it might be confused with
+the original MIT software.  M.I.T. makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+Individual source code files are copyright MIT, Cygnus Support, Novell,
+OpenVision Technologies, Oracle, Red Hat, Sun Microsystems,
 FundsXpress, and others.
 
 Project Athena, Athena, Athena MUSE, Discuss, Hesiod, Kerberos, Moira,
 and Zephyr are trademarks of the Massachusetts Institute of Technology
-(MIT).  No commercial use of these trademarks may be made without
-prior written permission of MIT.
+(MIT).  No commercial use of these trademarks may be made without prior
+written permission of MIT.
 
 "Commercial use" means use of a name in a product or other for-profit
 manner.  It does NOT prevent a commercial firm from referring to the
 MIT trademarks in order to convey information (although in doing so,
 recognition of their trademark status should be given).
 
-                         --------------------
+                          -------------------
 
-Portions of src/lib/crypto have the following copyright:
+The following copyright and permission notice applies to the OpenVision
+Kerberos Administration system located in `kadmin/create',
+`kadmin/dbutil', `kadmin/passwd', `kadmin/server', `lib/kadm5', and
+portions of `lib/rpc':
+
+  Copyright, OpenVision Technologies, Inc., 1993-1996, All Rights Reserved
+
+  WARNING:  Retrieving the OpenVision Kerberos Administration system source
+  code, as described below, indicates your acceptance of the following
+  terms.  If you do not agree to the following terms, do not retrieve the
+  OpenVision Kerberos administration system.
+
+  You may freely use and distribute the Source Code and Object Code
+  compiled from it, with or without modification, but this Source Code is
+  provided to you "AS IS" EXCLUSIVE OF ANY WARRANTY, INCLUDING, WITHOUT
+  LIMITATION, ANY WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A
+  PARTICULAR PURPOSE, OR ANY OTHER WARRANTY, WHETHER EXPRESS OR IMPLIED.
+  IN NO EVENT WILL OPENVISION HAVE ANY LIABILITY FOR ANY LOST PROFITS,
+  LOSS OF DATA OR COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR
+  FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS
+  AGREEMENT, INCLUDING, WITHOUT LIMITATION, THOSE RESULTING FROM THE USE
+  OF THE SOURCE CODE, OR THE FAILURE OF THE SOURCE CODE TO PERFORM, OR FOR
+  ANY OTHER REASON.
+
+  OpenVision retains all copyrights in the donated Source Code. OpenVision
+  also retains copyright to derivative works of the Source Code, whether
+  created by OpenVision or by a third party. The OpenVision copyright
+  notice must be preserved if derivative works are made based on the
+  donated Source Code.
+
+  OpenVision Technologies, Inc. has donated this Kerberos Administration
+  system to MIT for inclusion in the standard Kerberos 5 distribution.
+  This donation underscores our commitment to continuing Kerberos
+  technology development and our gratitude for the valuable work which has
+  been performed by MIT and the Kerberos community.
+
+                          -------------------
+
+  Portions contributed by Matt Crawford `<crawdad@fnal.gov>' were work
+  performed at Fermi National Accelerator Laboratory, which is operated
+  by Universities Research Association, Inc., under contract
+  DE-AC02-76CHO3000 with the U.S. Department of Energy.
+
+                          -------------------
+
+Portions of `src/lib/crypto' have the following copyright:
 
   Copyright (C) 1998 by the FundsXpress, INC.
 
   All rights reserved.
 
-  Export of this software from the United States of America may require
-  a specific license from the United States Government.  It is the
-  responsibility of any person or organization contemplating export to
-  obtain such a license before exporting.
+       Export of this software from the United States of America may
+       require a specific license from the United States Government.
+       It is the responsibility of any person or organization
+       contemplating export to obtain such a license before exporting.
 
   WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
   distribute this software and its documentation for any purpose and
@@ -67,58 +107,10 @@ Portions of src/lib/crypto have the following copyright:
   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-
-                         --------------------
-
-The following copyright and permission notice applies to the
-OpenVision Kerberos Administration system located in kadmin/create,
-kadmin/dbutil, kadmin/passwd, kadmin/server, lib/kadm5, and portions
-of lib/rpc:
-
-  Copyright, OpenVision Technologies, Inc., 1996, All Rights Reserved
-
-  WARNING: Retrieving the OpenVision Kerberos Administration system 
-  source code, as described below, indicates your acceptance of the 
-  following terms.  If you do not agree to the following terms, do not 
-  retrieve the OpenVision Kerberos administration system.
-
-  You may freely use and distribute the Source Code and Object Code
-  compiled from it, with or without modification, but this Source
-  Code is provided to you "AS IS" EXCLUSIVE OF ANY WARRANTY,
-  INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY OR
-  FITNESS FOR A PARTICULAR PURPOSE, OR ANY OTHER WARRANTY, WHETHER
-  EXPRESS OR IMPLIED.  IN NO EVENT WILL OPENVISION HAVE ANY LIABILITY
-  FOR ANY LOST PROFITS, LOSS OF DATA OR COSTS OF PROCUREMENT OF 
-  SUBSTITUTE GOODS OR SERVICES, OR FOR ANY SPECIAL, INDIRECT, OR
-  CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, INCLUDING, 
-  WITHOUT LIMITATION, THOSE RESULTING FROM THE USE OF THE SOURCE 
-  CODE, OR THE FAILURE OF THE SOURCE CODE TO PERFORM, OR FOR ANY 
-  OTHER REASON.
-
-  OpenVision retains all copyrights in the donated Source Code. OpenVision
-  also retains copyright to derivative works of the Source Code, whether
-  created by OpenVision or by a third party. The OpenVision copyright 
-  notice must be preserved if derivative works are made based on the 
-  donated Source Code.
-
-  OpenVision Technologies, Inc. has donated this Kerberos 
-  Administration system to MIT for inclusion in the standard 
-  Kerberos 5 distribution.  This donation underscores our 
-  commitment to continuing Kerberos technology development 
-  and our gratitude for the valuable work which has been 
-  performed by MIT and the Kerberos community.
-
-                         --------------------
-
-  Portions contributed by Matt Crawford <crawdad@fnal.gov> were
-  work performed at Fermi National Accelerator Laboratory, which is
-  operated by Universities Research Association, Inc., under
-  contract DE-AC02-76CHO3000 with the U.S. Department of Energy.
-
-                         --------------------
+                          -------------------
 
 The implementation of the Yarrow pseudo-random number generator in
-src/lib/crypto/yarrow has the following copyright:
+`src/lib/crypto/krb/prng/yarrow' has the following copyright:
 
   Copyright 2000 by Zero-Knowledge Systems, Inc.
 
@@ -141,60 +133,63 @@ src/lib/crypto/yarrow has the following copyright:
   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION, ARISING OUT
   OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-                         --------------------
+                          -------------------
 
 The implementation of the AES encryption algorithm in
-src/lib/crypto/aes has the following copyright:
+`src/lib/crypto/builtin/aes' has the following copyright:
+
+  Copyright (C) 2001, Dr Brian Gladman `<brg@gladman.uk.net>',
+  Worcester, UK.
 
-  Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
   All rights reserved.
 
   LICENSE TERMS
 
-  The free distribution and use of this software in both source and binary 
+  The free distribution and use of this software in both source and binary
   form is allowed (with or without changes) provided that:
-
-    1. distributions of this source code include the above copyright 
+    1. distributions of this source code include the above copyright
        notice, this list of conditions and the following disclaimer;
 
-    2. distributions in binary form include the above copyright
-       notice, this list of conditions and the following disclaimer
-       in the documentation and/or other associated materials;
+    2. distributions in binary form include the above copyright notice,
+       this list of conditions and the following disclaimer in the
+       documentation and/or other associated materials;
 
-    3. the copyright holder's name is not used to endorse products 
-       built using this software without specific written permission. 
+    3. the copyright holder's name is not used to endorse products
+       built using this software without specific written permission.
 
   DISCLAIMER
 
   This software is provided 'as is' with no explcit or implied warranties
-  in respect of any properties, including, but not limited to, correctness 
+  in respect of any properties, including, but not limited to, correctness
   and fitness for purpose.
 
-                         --------------------
+                          -------------------
 
 Portions contributed by Red Hat, including the pre-authentication
-plug-ins framework and the NSS crypto implementation, contain the
+plug-in framework and the NSS crypto implementation, contain the
 following copyright:
 
-  Copyright (c) 2006 Red Hat, Inc.
-  Portions copyright (c) 2006 Massachusetts Institute of Technology
+  Copyright (C) 2006 Red Hat, Inc.
+
+  Portions copyright (C) 2006 Massachusetts Institute of Technology
+
   All Rights Reserved.
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
 
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
 
-  * 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.
+     * 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.
 
-  * Neither the name of Red Hat, Inc., nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
+     * Neither the name of Red Hat, Inc., nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
 
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -208,10 +203,10 @@ following copyright:
   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-                         --------------------
+                          -------------------
 
 The implementations of GSSAPI mechglue in GSSAPI-SPNEGO in
-src/lib/gssapi, including the following files:
+`src/lib/gssapi', including the following files:
 
   lib/gssapi/generic/gssapi_err_generic.et
   lib/gssapi/mechglue/g_accept_sec_context.c
@@ -264,13 +259,9 @@ the following new or changed files:
   slave/kpropd_rpc.c
   slave/kproplog.c
 
-and marked portions of the following files:
-
-  lib/krb5/os/hst_realm.c
-
 are subject to the following license:
 
-  Copyright (c) 2004 Sun Microsystems, Inc.
+  Copyright (C) 2004 Sun Microsystems, Inc.
 
   Permission is hereby granted, free of charge, to any person obtaining a
   copy of this software and associated documentation files (the
@@ -291,30 +282,30 @@ are subject to the following license:
   TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-                         --------------------
+                          -------------------
 
-MIT Kerberos includes documentation and software developed at the
+Kerberos V5 includes documentation and software developed at the
 University of California at Berkeley, which includes this copyright
 notice:
 
   Copyright (C) 1983 Regents of the University of California.
+
   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.
+  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.
+    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. Neither the name of the University nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
+    3. Neither the name of the University nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
 
   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND
   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -328,24 +319,27 @@ notice:
   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
 
-                         --------------------
+                          -------------------
 
 Portions contributed by Novell, Inc., including the LDAP database
 backend, are subject to the following license:
 
-  Copyright (c) 2004-2005, Novell, Inc.
+  Copyright (C) 2004-2005, Novell, Inc.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
 
-    * Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-    * 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.
-    * The copyright holder's name is not used to endorse or promote products
-        derived from this software without specific prior written permission.
+     * 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.
+
+     * The copyright holder's name is not used to endorse or promote
+       products derived from this software without specific prior
+       written permission.
 
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -359,15 +353,17 @@ backend, are subject to the following license:
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE.
 
-                         --------------------
+                          -------------------
 
 Portions funded by Sandia National Laboratory and developed by the
-University of Michigan's Center for Information Technology
-Integration, including the PKINIT implementation, are subject to the
-following license:
+University of Michigan's Center for Information Technology Integration,
+including the PKINIT implementation, are subject to the following
+license:
 
   COPYRIGHT (C) 2006-2007
+
   THE REGENTS OF THE UNIVERSITY OF MICHIGAN
+
   ALL RIGHTS RESERVED
 
   Permission is granted to use, copy, create derivative works
@@ -394,10 +390,9 @@ following license:
   IF IT HAS BEEN OR IS HEREAFTER ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGES.
 
-                         --------------------
+                          -------------------
 
-The pkcs11.h file included in the PKINIT code has the following
-license:
+The pkcs11.h file included in the PKINIT code has the following license:
 
   Copyright 2006 g10 Code GmbH
   Copyright 2006 Andreas Jellinghaus
@@ -411,164 +406,144 @@ license:
   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
   PURPOSE.
 
-                         --------------------
+                          -------------------
 
 Portions contributed by Apple Inc. are subject to the following license:
 
-Copyright 2004-2008 Apple Inc.  All Rights Reserved.
-
-Export of this software from the United States of America may require
-a specific license from the United States Government.  It is the
-responsibility of any person or organization contemplating export to
-obtain such a license before exporting.
-
-WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation, and that
-the name of Apple Inc. not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.  Apple Inc. makes no representations about the suitability of
-this software for any purpose.  It is provided "as is" without express
-or implied warranty.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+  Copyright 2004-2008 Apple Inc.  All Rights Reserved.
 
-                         --------------------
+       Export of this software from the United States of America may
+       require a specific license from the United States Government.
+       It is the responsibility of any person or organization
+       contemplating export to obtain such a license before exporting.
 
-The implementations of strlcpy and strlcat in
-src/util/support/strlcat.c have the following copyright and permission
-notice:
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+  WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+  distribute this software and its documentation for any purpose and
+  without fee is hereby granted, provided that the above copyright
+  notice appear in all copies and that both that copyright notice and
+  this permission notice appear in supporting documentation, and that
+  the name of Apple Inc. not be used in advertising or publicity pertaining
+  to distribution of the software without specific, written prior
+  permission.  Apple Inc. makes no representations about the suitability of
+  this software for any purpose.  It is provided "as is" without express
+  or implied warranty.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+  WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-                         --------------------
+                          -------------------
 
 The implementations of UTF-8 string handling in src/util/support and
 src/lib/krb5/unicode are subject to the following copyright and
 permission notice:
 
-The OpenLDAP Public License
+  The OpenLDAP Public License
+
   Version 2.8, 17 August 2003
 
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions in source form must retain copyright statements
-   and notices,
-
-2. Redistributions in binary form must reproduce applicable copyright
-   statements and notices, this list of conditions, and the following
-   disclaimer in the documentation and/or other materials provided
-   with the distribution, and
-
-3. Redistributions must contain a verbatim copy of this document.
-
-The OpenLDAP Foundation may revise this license from time to time.
-Each revision is distinguished by a version number.  You may use
-this Software under terms of this license revision or under the
-terms of any subsequent revision of the license.
-
-THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
-CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED 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 THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
-OR OWNER(S) OF THE SOFTWARE 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.
-
-The names of the authors and copyright holders must not be used in
-advertising or otherwise to promote the sale, use or other dealing
-in this Software without specific, written prior permission.  Title
-to copyright in this Software shall at all times remain with copyright
-holders.
-
-OpenLDAP is a registered trademark of the OpenLDAP Foundation.
-
-Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
-California, USA.  All Rights Reserved.  Permission to copy and
-distribute verbatim copies of this document is granted.
-
-                         --------------------
+  Redistribution and use of this software and associated documentation
+  ("Software"), with or without modification, are permitted provided
+  that the following conditions are met:
+    1. Redistributions in source form must retain copyright statements
+       and notices,
+
+    2. Redistributions in binary form must reproduce applicable
+       copyright statements and notices, this list of conditions, and
+       the following disclaimer in the documentation and/or other
+       materials provided with the distribution, and
+
+    3. Redistributions must contain a verbatim copy of this document.
+
+  The OpenLDAP Foundation may revise this license from time to time.
+  Each revision is distinguished by a version number.  You may use
+  this Software under terms of this license revision or under the
+  terms of any subsequent revision of the license.
+
+  THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
+  CONTRIBUTORS "AS IS" AND ANY EXPRESSED 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 THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
+  OR OWNER(S) OF THE SOFTWARE 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.
 
-Marked test programs in src/lib/krb5/krb have the following copyright:
+  The names of the authors and copyright holders must not be used in
+  advertising or otherwise to promote the sale, use or other dealing
+  in this Software without specific, written prior permission.  Title
+  to copyright in this Software shall at all times remain with copyright
+  holders.
 
-Copyright (c) 2006 Kungliga Tekniska Högskolan
-(Royal Institute of Technology, Stockholm, Sweden).
-All rights reserved.
+  OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+  Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
+  California, USA.  All Rights Reserved.  Permission to copy and
+  distribute verbatim copies of this document is granted.
 
-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.
+Marked test programs in src/lib/krb5/krb have the following copyright:
 
-3. Neither the name of KTH nor the names of its contributors may be
-   used to endorse or promote products derived from this software without
-   specific prior written permission.
+  Copyright (C) 2006 Kungliga Tekniska Högskolan
+  (Royal Institute of Technology, Stockholm, Sweden).
+  All rights reserved.
 
-THIS SOFTWARE IS PROVIDED BY KTH AND ITS 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 KTH OR ITS 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.
+  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. Neither the name of KTH nor the names of its contributors may be
+       used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY KTH AND ITS 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 KTH OR ITS 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.
 
-                         --------------------
+                          -------------------
 
 Portions of the RPC implementation in src/lib/rpc and src/include/gssrpc
 have the following copyright and permission notice:
 
-  Copyright (c) 2010, Oracle America, Inc.
+  Copyright (C) 2010, Oracle America, Inc.
 
   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.
 
-      * Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
-
-      * 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.
+    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.
 
-      * Neither the name of the "Oracle America, Inc." nor the names of
-	its contributors may be used to endorse or promote products
-	derived from this software without specific prior written permission.
+    3. Neither the name of the "Oracle America, Inc." nor the names of
+       its contributors may be used to endorse or promote products
+       derived from this software without specific prior written
+       permission.
 
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -581,3 +556,490 @@ have the following copyright and permission notice:
   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.
+
+                          -------------------
+
+  Copyright (C) 2006,2007,2009
+  NTT (Nippon Telegraph and Telephone Corporation).  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 as
+       the first lines of this file unmodified.
+
+    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.
+
+  THIS SOFTWARE IS PROVIDED BY NTT "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 NTT 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.
+
+                          -------------------
+
+  Copyright 2000 by Carnegie Mellon University
+
+  All Rights Reserved
+
+  Permission to use, copy, modify, and distribute this software and its
+  documentation for any purpose and without fee is hereby granted,
+  provided that the above copyright notice appear in all copies and that
+  both that copyright notice and this permission notice appear in
+  supporting documentation, and that the name of Carnegie Mellon
+  University not be used in advertising or publicity pertaining to
+  distribution of the software without specific, written prior
+  permission.
+
+  CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+  THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+  FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
+  ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+  OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+                          -------------------
+
+  Copyright (C) 2002 Naval Research Laboratory (NRL/CCS)
+
+  Permission to use, copy, modify and distribute this software and its
+  documentation is hereby granted, provided that both the copyright
+  notice and this permission notice appear in all copies of the software,
+  derivative works or modified versions, and any portions thereof.
+
+  NRL ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION AND
+  DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER
+  RESULTING FROM THE USE OF THIS SOFTWARE.
+
+                          -------------------
+
+Portions extracted from Internet RFCs have the following copyright
+notice:
+
+  Copyright (C) The Internet Society (2006).
+
+  This document is subject to the rights, licenses and restrictions
+  contained in BCP 78, and except as set forth therein, the authors
+  retain all their rights.
+
+  This document and the information contained herein are provided on an
+  "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+  OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE INTERNET
+  ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED,
+  INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+  INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+  WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+                          -------------------
+
+  Copyright (C) 1991, 1992, 1994 by Cygnus Support.
+
+  Permission to use, copy, modify, and
+  distribute this software and its documentation for any purpose and
+  without fee is hereby granted, provided that the above copyright
+  notice appear in all copies and that both that copyright notice and
+  this permission notice appear in supporting documentation.
+  Cygnus Support makes no representations about the suitability of
+  this software for any purpose.  It is provided "as is" without express
+  or implied warranty.
+
+                          -------------------
+
+  Copyright (C) 2006 Secure Endpoints Inc.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation
+  files (the "Software"), to deal in the Software without
+  restriction, including without limitation the rights to use, copy,
+  modify, merge, publish, distribute, sublicense, and/or sell copies
+  of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY 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.
+
+                          -------------------
+
+Portions of the implementation of the Fortuna-like PRNG are subject to
+the following notice:
+
+  Copyright (C) 2005 Marko Kreen
+  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.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR 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.
+
+  Copyright (C) 1994 by the University of Southern California
+
+       EXPORT OF THIS SOFTWARE from the United States of America may
+       require a specific license from the United States Government.
+       It is the responsibility of any person or organization
+       contemplating export to obtain such a license before exporting.
+
+  WITHIN THAT CONSTRAINT, permission to copy, modify, and distribute
+  this software and its documentation in source and binary forms is
+  hereby granted, provided that any documentation or other materials
+  related to such distribution or use acknowledge that the software
+  was developed by the University of Southern California.
+
+  DISCLAIMER OF WARRANTY.  THIS SOFTWARE IS PROVIDED "AS IS".  The
+  University of Southern California MAKES NO REPRESENTATIONS OR
+  WARRANTIES, EXPRESS OR IMPLIED.  By way of example, but not
+  limitation, the University of Southern California MAKES NO
+  REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
+  PARTICULAR PURPOSE. The University of Southern
+  California shall not be held liable for any liability nor for any
+  direct, indirect, or consequential damages with respect to any
+  claim by the user or distributor of the ksu software.
+
+                          -------------------
+
+  Copyright (C) 1995
+  The President and Fellows of Harvard University
+
+  This code is derived from software contributed to Harvard by
+  Jeremy Rassen.
+
+  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 advertising materials mentioning features or use of this
+       software must display the following acknowledgement:
+
+            This product includes software developed by the University
+            of California, Berkeley and its contributors.
+
+    4. Neither the name of the University nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 THE REGENTS 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.
+
+                          -------------------
+
+  Copyright (C) 2008 by the Massachusetts Institute of Technology.
+  Copyright 1995 by Richard P. Basch.  All Rights Reserved.
+  Copyright 1995 by Lehman Brothers, Inc.  All Rights Reserved.
+
+       Export of this software from the United States of America may
+       require a specific license from the United States Government.
+       It is the responsibility of any person or organization
+       contemplating export to obtain such a license before exporting.
+
+  WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+  distribute this software and its documentation for any purpose and
+  without fee is hereby granted, provided that the above copyright
+  notice appear in all copies and that both that copyright notice and
+  this permission notice appear in supporting documentation, and that
+  the name of Richard P. Basch, Lehman Brothers and M.I.T. not be used
+  in advertising or publicity pertaining to distribution of the software
+  without specific, written prior permission.  Richard P. Basch,
+  Lehman Brothers and M.I.T. make no representations about the suitability
+  of this software for any purpose.  It is provided "as is" without
+  express or implied warranty.
+
+                          -------------------
+
+The following notice applies to `src/lib/krb5/krb/strptime.c':
+
+  Copyright (C) 1997, 1998 The NetBSD Foundation, Inc.
+  All rights reserved.
+
+  This code was contributed to The NetBSD Foundation by Klaus Klein.
+
+  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 advertising materials mentioning features or use of this
+       software must display the following acknowledgement:
+
+            This product includes software developed by the NetBSD
+            Foundation, Inc. and its contributors.
+
+    4. Neither the name of The NetBSD Foundation nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 THE FOUNDATION 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.
+
+                          -------------------
+
+The following notice applies to Unicode library files in
+`src/lib/krb5/unicode':
+
+  Copyright 1997, 1998, 1999 Computing Research Labs,
+  New Mexico State University
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+  THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
+  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.
+
+                          -------------------
+
+The following notice applies to `src/util/support/strlcpy.c':
+
+  Copyright (C) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+
+  Permission to use, copy, modify, and distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+                          -------------------
+
+The following notice applies to `src/util/profile/argv_parse.c' and
+`src/util/profile/argv_parse.h':
+
+  Copyright 1999 by Theodore Ts'o.
+
+  Permission to use, copy, modify, and distribute this software for
+  any purpose with or without fee is hereby granted, provided that
+  the above copyright notice and this permission notice appear in all
+  copies.  THE SOFTWARE IS PROVIDED "AS IS" AND THEODORE TS'O (THE
+  AUTHOR) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+  RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+  OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+  IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  (Isn't
+  it sick that the U.S. culture of lawsuit-happy lawyers requires
+  this kind of disclaimer?)
+
+                          -------------------
+
+The following notice applies to SWIG-generated code in
+`src/util/profile/profile_tcl.c':
+
+  Copyright (C) 1999-2000, The University of Chicago
+
+  This file may be freely redistributed without license or fee provided
+  this copyright message remains intact.
+
+                          -------------------
+
+The following notice applies to portiions of `src/lib/rpc' and
+`src/include/gssrpc':
+
+  Copyright (C) 2000 The Regents of the University of Michigan.
+  All rights reserved.
+
+  Copyright (C) 2000 Dug Song <dugsong@UMICH.EDU>.
+  All rights reserved, all wrongs reversed.
+
+  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. Neither the name of the University nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED "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 THE REGENTS 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.
+
+                          -------------------
+
+Implementations of the MD4 algorithm are subject to the following
+notice:
+
+  Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.
+
+  License to copy and use this software is granted provided that
+  it is identified as the "RSA Data Security, Inc. MD4 Message
+  Digest Algorithm" in all material mentioning or referencing this
+  software or this function.
+
+  License is also granted to make and use derivative works
+  provided that such works are identified as "derived from the RSA
+  Data Security, Inc. MD4 Message Digest Algorithm" in all
+  material mentioning or referencing the derived work.
+
+  RSA Data Security, Inc. makes no representations concerning
+  either the merchantability of this software or the suitability
+  of this software for any particular purpose.  It is provided "as
+  is" without express or implied warranty of any kind.
+
+  These notices must be retained in any copies of any part of this
+  documentation and/or software.
+
+                          -------------------
+
+Implementations of the MD5 algorithm are subject to the following
+notice:
+
+  Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.
+
+  License to copy and use this software is granted provided that
+  it is identified as the "RSA Data Security, Inc. MD5 Message-
+  Digest Algorithm" in all material mentioning or referencing this
+  software or this function.
+
+  License is also granted to make and use derivative works
+  provided that such works are identified as "derived from the RSA
+  Data Security, Inc. MD5 Message-Digest Algorithm" in all
+  material mentioning or referencing the derived work.
+
+  RSA Data Security, Inc. makes no representations concerning
+  either the merchantability of this software or the suitability
+  of this software for any particular purpose.  It is provided "as
+  is" without express or implied warranty of any kind.
+
+  These notices must be retained in any copies of any part of this
+  documentation and/or software.
+
+                          -------------------
+
+The following notice applies to `src/lib/crypto/krb/crc32/crc32.c':
+
+  Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
+  rights reserved.
+
+  RSA Data Security, Inc. makes no representations concerning either
+  the merchantability of this software or the suitability of this
+  software for any particular purpose. It is provided "as is"
+  without express or implied warranty of any kind.
+
+  These notices must be retained in any copies of any part of this
+  documentation and/or software.
+
+                          -------------------
+
+Portions of `src/lib/krb5' are subject to the following notice:
+
+  Copyright (C) 1994 CyberSAFE Corporation.
+  Copyright 1990,1991,2007,2008 by the Massachusetts Institute of Technology.
+  All Rights Reserved.
+
+       Export of this software from the United States of America may
+       require a specific license from the United States Government.
+       It is the responsibility of any person or organization
+       contemplating export to obtain such a license before exporting.
+
+  WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+  distribute this software and its documentation for any purpose and
+  without fee is hereby granted, provided that the above copyright
+  notice appear in all copies and that both that copyright notice and
+  this permission notice appear in supporting documentation, and that
+  the name of M.I.T. not be used in advertising or publicity pertaining
+  to distribution of the software without specific, written prior
+  permission.  Furthermore if you modify this software you must label
+  your software as modified software and not distribute it in such a
+  fashion that it might be confused with the original M.I.T. software.
+  Neither M.I.T., the Open Computing Security Group, nor
+  CyberSAFE Corporation make any representations about the suitability of
+  this software for any purpose.  It is provided "as is" without express
+  or implied warranty.
+
diff --git a/doc/Makefile b/doc/Makefile
index 8572ff5d8d..3e0fcf6ce6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -151,3 +151,6 @@ tgz::
 	$(TAR) krb5-docs.tar admin.texinfo build.texinfo copyright.texinfo definitions.texinfo document-list.texinfo glossary.texinfo install.texinfo texinfo.tex user-guide.texinfo *-guide.ps *.info *.info-? *.html
 	$(GZIP) krb5-docs.tar
 	$(MV) krb5-docs.tar.gz krb5-docs.tgz
+
+../NOTICE: notice.texinfo definitions.texinfo copyright.texinfo
+	makeinfo --plaintext -o $@ notice.texinfo
diff --git a/doc/admin.texinfo b/doc/admin.texinfo
index bcabb62d77..5dcc0d3742 100644
--- a/doc/admin.texinfo
+++ b/doc/admin.texinfo
@@ -8,7 +8,12 @@
 @setchapternewpage odd                  @c chapter begins on next odd page
 @c @setchapternewpage on                   @c chapter begins on next page
 @c @smallbook                              @c Format for 7" X 9.25" paper
+@documentencoding UTF-8
 @c %**end of header
+@copying
+Copyright @copyright{} 1985-2010 by the Massachusetts Institute of Technology.
+@end copying
+
 @paragraphindent 0
 @iftex
 @parskip 6pt plus 6pt
@@ -34,15 +39,17 @@
 
 @page
 @vskip 0pt plus 1filll
-
+@insertcopying
 @end titlepage
 
 @comment  node-name,  next,  previous,  up
-@node Top, Copyright, (dir), (dir)
+@node Top, Introduction, (dir), (dir)
 
 @ifinfo
 This document describes how to administrate a @value{PRODUCT}
 installation.
+
+@insertcopying
 @end ifinfo
 
 @c The master menu is updated using emacs19's M-x texinfo-all-menus-update
@@ -61,7 +68,6 @@ installation.
 @c ---------------------------------------------------------------------
 
 @menu
-* Copyright::                   
 * Introduction::                
 * How Kerberos Works::          
 * Configuration Files::         
@@ -72,14 +78,10 @@ installation.
 * Backups of Secure Hosts::     
 * Bug Reporting::               
 * Appendix::                    
+* Copyright::                   
 @end menu
 
-@node Copyright, Introduction, Top, Top
-@unnumbered Copyright
-@include copyright.texinfo
-
-
-@node Introduction, How Kerberos Works, Copyright, Top
+@node Introduction, How Kerberos Works, Top, Top
 @chapter Introduction
 
 @menu
@@ -410,8 +412,8 @@ salt.  The supported values for salts are as follows.
 * capaths::                     
 * dbdefaults::                  
 * dbmodules::                   
-* plugins::
-* pkinit client options::
+* plugins::                     
+* pkinit client options::       
 * Sample krb5.conf File::       
 @end menu
 
@@ -1108,8 +1110,8 @@ This LDAP specific tags indicates the number of connections to be maintained per
 @subsection Plugins
 
 @menu
-* pwqual interface::             
-* kadm5_hook interface::
+* pwqual interface::            
+* kadm5_hook interface::        
 @end menu
 
 Tags in the [plugins] section can be used to register dynamic plugin
@@ -1177,8 +1179,8 @@ in for this interface.
 @subsection pkinit options
 
 @menu
-* pkinit identity syntax::
-* pkinit krb5.conf options::
+* pkinit identity syntax::      
+* pkinit krb5.conf options::    
 @end menu
 
 The following are @b{pkinit-specific} options.
@@ -1531,7 +1533,7 @@ Here is an example of a generic @code{krb5.conf} file:
 @menu
 * kdcdefaults::                 
 * realms (kdc.conf)::           
-* pkinit kdc options::
+* pkinit kdc options::          
 * Sample kdc.conf File::        
 @end menu
 
@@ -1746,7 +1748,7 @@ This option defaults to @code{true}.
 @subsection pkinit options
 
 @menu
-* pkinit kdc.conf options::
+* pkinit kdc.conf options::     
 @end menu
 
 The following are @b{pkinit-specific} options.
@@ -2633,7 +2635,7 @@ passwords kept in the database.
 * Retrieving the List of Policies::  
 * Adding or Modifying Policies::  
 * Deleting Policies::           
-* Updating the History Key::
+* Updating the History Key::    
 @end menu
 
 @node Retrieving Policies, Retrieving the List of Policies, Policies, Policies
@@ -2781,6 +2783,7 @@ it.  The @code{delete_policy} command will fail if it is in use by any
 principals.
 
 @node Updating the History Key,  , Deleting Policies, Policies
+@subsection Updating the History Key
 
 If a policy specifies a number of old keys kept of two or more, the
 stored old keys are encrypted in a history key, which is found in the
@@ -4568,7 +4571,7 @@ Database from a Dump File}.)
 
 @include send-pr.texinfo
 
-@node Appendix,  , Bug Reporting, Top
+@node Appendix, Copyright, Bug Reporting, Top
 @appendix Appendix
 
 @menu
@@ -5538,6 +5541,10 @@ New Zealand Daylight Time.  (13 hours ahead of GMT.)
 International Date Line East.  (12 hours ahead of GMT.)
 @end table
 
+@node Copyright,  , Appendix, Top
+@appendix Copyright
+@include copyright.texinfo
+
 @contents
 @bye
 
diff --git a/doc/copyright.texinfo b/doc/copyright.texinfo
index bb6a5d62b7..5598c0922a 100644
--- a/doc/copyright.texinfo
+++ b/doc/copyright.texinfo
@@ -1,11 +1,13 @@
 Copyright @copyright{} 1985-2010 by the Massachusetts Institute of Technology.
 
-@quotation
+All rights reserved.
+
+@smalldisplay
 Export of software employing encryption from the United States of
 America may require a specific license from the United States
 Government.  It is the responsibility of any person or organization
 contemplating export to obtain such a license before exporting.
-@end quotation
+@end smalldisplay
 
 WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute
 this software and its documentation for any purpose and without fee is
@@ -34,11 +36,7 @@ manner.  It does NOT prevent a commercial firm from referring to the
 MIT trademarks in order to convey information (although in doing so,
 recognition of their trademark status should be given).
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
 The following copyright and permission notice applies to the
 OpenVision Kerberos Administration system located in
@@ -46,17 +44,14 @@ OpenVision Kerberos Administration system located in
 @code{kadmin/server}, @code{lib/kadm5}, and portions of
 @code{lib/rpc}:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
-Copyright, OpenVision Technologies, Inc., 1996, All Rights Reserved
-     
+@smalldisplay
+Copyright, OpenVision Technologies, Inc., 1993-1996, All Rights Reserved
+
 WARNING:  Retrieving the OpenVision Kerberos Administration system source
 code, as described below, indicates your acceptance of the following
 terms.  If you do not agree to the following terms, do not retrieve the
 OpenVision Kerberos administration system.
-     
+
 You may freely use and distribute the Source Code and Object Code
 compiled from it, with or without modification, but this Source Code is
 provided to you ``AS IS'' EXCLUSIVE OF ANY WARRANTY, INCLUDING, WITHOUT
@@ -74,47 +69,38 @@ also retains copyright to derivative works of the Source Code, whether
 created by OpenVision or by a third party. The OpenVision copyright
 notice must be preserved if derivative works are made based on the
 donated Source Code.
-     
+
 OpenVision Technologies, Inc. has donated this Kerberos Administration
 system to MIT for inclusion in the standard Kerberos 5 distribution.
 This donation underscores our commitment to continuing Kerberos
 technology development and our gratitude for the valuable work which has
 been performed by MIT and the Kerberos community.
-@end quotation
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
-@quotation
+@smalldisplay
 Portions contributed by Matt Crawford @code{<crawdad@@fnal.gov>} were work
 performed at Fermi National Accelerator Laboratory, which is operated
 by Universities Research Association, Inc., under contract
 DE-AC02-76CHO3000 with the U.S. Department of Energy.
-@end quotation
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
 Portions of @code{src/lib/crypto} have the following copyright:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
+@smalldisplay
 Copyright @copyright{} 1998 by the FundsXpress, INC.
 
 All rights reserved.
 
+@quotation
 Export of this software from the United States of America may require
 a specific license from the United States Government.  It is the
 responsibility of any person or organization contemplating export to
 obtain such a license before exporting.
+@end quotation
 
 WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
 distribute this software and its documentation for any purpose and
@@ -130,22 +116,14 @@ or implied warranty.
 THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+@end smalldisplay
 
-@end quotation
-
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
 The implementation of the Yarrow pseudo-random number generator
-in @code{src/lib/crypto/yarrow} has the following copyright:
+in @code{src/lib/crypto/krb/prng/yarrow} has the following copyright:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
+@smalldisplay
 Copyright 2000 by Zero-Knowledge Systems, Inc.
 
 Permission to use, copy, modify, distribute, and sell this software
@@ -166,63 +144,50 @@ ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION, ARISING OUT
 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-@end quotation
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
 The implementation of the AES encryption algorithm in
-@code{src/lib/crypto/aes} has the following copyright:
+@code{src/lib/crypto/builtin/aes} has the following copyright:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
+@smalldisplay
 Copyright @copyright{} 2001, Dr Brian Gladman @code{<brg@@gladman.uk.net>},
 Worcester, UK.@*
 All rights reserved.
 
 LICENSE TERMS
 
-The free distribution and use of this software in both source and binary 
+The free distribution and use of this software in both source and binary
 form is allowed (with or without changes) provided that:
 
 @enumerate
 @item
-distributions of this source code include the above copyright 
+distributions of this source code include the above copyright
 notice, this list of conditions and the following disclaimer;
 @item
 distributions in binary form include the above copyright
 notice, this list of conditions and the following disclaimer
 in the documentation and/or other associated materials;
 @item
-the copyright holder's name is not used to endorse products 
-built using this software without specific written permission. 
+the copyright holder's name is not used to endorse products
+built using this software without specific written permission.
 @end enumerate
 
 DISCLAIMER
 
 This software is provided 'as is' with no explcit or implied warranties
-in respect of any properties, including, but not limited to, correctness 
+in respect of any properties, including, but not limited to, correctness
 and fitness for purpose.
-@end quotation
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
 Portions contributed by Red Hat, including the pre-authentication
-plug-in framework, contain the following copyright:
+plug-in framework and the NSS crypto implementation, contain the
+following copyright:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
+@smalldisplay
 Copyright @copyright{} 2006 Red Hat, Inc.@*
 Portions copyright @copyright{} 2006 Massachusetts Institute of Technology@*
 All Rights Reserved.@*
@@ -232,7 +197,6 @@ modification, are permitted provided that the following conditions are
 met:
 
 @itemize
-
 @item
 Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
@@ -257,14 +221,9 @@ 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.
+@end smalldisplay
 
-@end quotation
-
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
 The implementations of GSSAPI mechglue in GSSAPI-SPNEGO in
 @code{src/lib/gssapi}, including the following files:
@@ -313,23 +272,20 @@ and the initial implementation of incremental propagation, including
 the following new or changed files:
 
 @smallexample
-  include/iprop_hdr.h
-  kadmin/server/ipropd_svc.c
-  lib/kdb/iprop.x
-  lib/kdb/kdb_convert.c
-  lib/kdb/kdb_log.c
-  lib/kdb/kdb_log.h
-  lib/krb5/error_tables/kdb5_err.et
-  slave/kpropd_rpc.c
-  slave/kproplog.c
+include/iprop_hdr.h
+kadmin/server/ipropd_svc.c
+lib/kdb/iprop.x
+lib/kdb/kdb_convert.c
+lib/kdb/kdb_log.c
+lib/kdb/kdb_log.h
+lib/krb5/error_tables/kdb5_err.et
+slave/kpropd_rpc.c
+slave/kproplog.c
 @end smallexample
 
 are subject to the following license:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
+@smalldisplay
 Copyright @copyright{} 2004 Sun Microsystems, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -350,28 +306,22 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 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.
-@end quotation
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
 @value{PRODUCT} includes documentation and software developed at the
 University of California at Berkeley, which includes this copyright
 notice:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
+@smalldisplay
 Copyright @copyright{} 1983 Regents of the University of California.@*
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
+
 @enumerate
 @item
 Redistributions of source code must retain the above copyright
@@ -397,22 +347,15 @@ 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.
-@end quotation
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
 Portions contributed by Novell, Inc., including the LDAP database
 backend, are subject to the following license:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
-Copyright (c) 2004-2005, Novell, Inc.
+@smalldisplay
+Copyright @copyright{} 2004-2005, Novell, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -442,13 +385,9 @@ 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.
-@end quotation
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
 
 Portions funded by Sandia National Laboratory
 and developed by the University of Michigan's
@@ -456,11 +395,7 @@ Center for Information Technology Integration,
 including the PKINIT implementation, are subject
 to the following license:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
-
+@smalldisplay
 COPYRIGHT @copyright{} 2006-2007@*
 THE REGENTS OF THE UNIVERSITY OF MICHIGAN@*
 ALL RIGHTS RESERVED
@@ -488,16 +423,14 @@ CONSEQUENTIAL DAMAGES, WITH RESPECT TO ANY CLAIM ARISING
 OUT OF OR IN CONNECTION WITH THE USE OF THE SOFTWARE, EVEN
 IF IT HAS BEEN OR IS HEREAFTER ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
-@end quotation
+@end smalldisplay
+
+@cdivider
 
 The pkcs11.h file included in the PKINIT code has the
 following license:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
-
+@smalldisplay
 Copyright 2006 g10 Code GmbH
 Copyright 2006 Andreas Jellinghaus
 
@@ -509,27 +442,21 @@ This file is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY, to the extent permitted by law; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
-@end quotation
+@cdivider
 
 Portions contributed by Apple Inc. are subject to the following license:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
-
+@smalldisplay
 Copyright 2004-2008 Apple Inc.  All Rights Reserved.
 
+@quotation
 Export of this software from the United States of America may require
 a specific license from the United States Government.  It is the
 responsibility of any person or organization contemplating export to
 obtain such a license before exporting.
+@end quotation
 
 WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
 distribute this software and its documentation for any purpose and
@@ -545,39 +472,34 @@ or implied warranty.
 THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
-@end quotation
+@cdivider
 
 The implementations of UTF-8 string handling in src/util/support and
 src/lib/krb5/unicode are subject to the following copyright and
 permission notice:
 
-@quotation
-@iftex
-@smallfonts @rm
-@end iftex
-
-The OpenLDAP Public License
-  Version 2.8, 17 August 2003
+@smalldisplay
+The OpenLDAP Public License@*
+Version 2.8, 17 August 2003
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
 that the following conditions are met:
 
-1. Redistributions in source form must retain copyright statements
-   and notices,
-
-2. Redistributions in binary form must reproduce applicable copyright
-   statements and notices, this list of conditions, and the following
-   disclaimer in the documentation and/or other materials provided
-   with the distribution, and
-
-3. Redistributions must contain a verbatim copy of this document.
+@enumerate
+@item
+Redistributions in source form must retain copyright statements
+and notices,
+@item
+Redistributions in binary form must reproduce applicable copyright
+statements and notices, this list of conditions, and the following
+disclaimer in the documentation and/or other materials provided
+with the distribution, and
+@item
+Redistributions must contain a verbatim copy of this document.
+@end enumerate
 
 The OpenLDAP Foundation may revise this license from time to time.
 Each revision is distinguished by a version number.  You may use
@@ -609,14 +531,639 @@ OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
 California, USA.  All Rights Reserved.  Permission to copy and
 distribute verbatim copies of this document is granted.
+@end smalldisplay
 
-@iftex
-@vskip 12pt
-@hrule
-@vskip 12pt
-@end iftex
+@cdivider
+
+Marked test programs in src/lib/krb5/krb have the following copyright:
+
+@smalldisplay
+Copyright @copyright{} 2006 Kungliga Tekniska Högskolan
+(Royal Institute of Technology, Stockholm, Sweden).
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+@enumerate
+@item
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+@item
+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.
+@item
+Neither the name of KTH nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+@end enumerate
+
+THIS SOFTWARE IS PROVIDED BY KTH AND ITS 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 KTH OR ITS 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.
+@end smalldisplay
+
+@cdivider
+
+Portions of the RPC implementation in src/lib/rpc and src/include/gssrpc
+have the following copyright and permission notice:
+
+@smalldisplay
+Copyright @copyright{} 2010, Oracle America, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+@enumerate
+@item
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+@item
+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.
+@item
+Neither the name of the "Oracle America, Inc." nor the names of
+its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
+@end enumerate
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 THE COPYRIGHT
+HOLDER 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.
+@end smalldisplay
+
+@cdivider
+
+@smalldisplay
+Copyright @copyright{} 2006,2007,2009
+NTT (Nippon Telegraph and Telephone Corporation).  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+@enumerate
+@item
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer as
+the first lines of this file unmodified.
+@item
+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.
+@end enumerate
+
+THIS SOFTWARE IS PROVIDED BY NTT ``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 NTT 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.
+@end smalldisplay
+
+@cdivider
+
+@smalldisplay
+Copyright 2000 by Carnegie Mellon University
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Carnegie Mellon
+University not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
+ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+@end smalldisplay
+
+@cdivider
+
+@smalldisplay
+Copyright @copyright{} 2002 Naval Research Laboratory (NRL/CCS)
+
+Permission to use, copy, modify and distribute this software and its
+documentation is hereby granted, provided that both the copyright
+notice and this permission notice appear in all copies of the software,
+derivative works or modified versions, and any portions thereof.
+
+NRL ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION AND
+DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER
+RESULTING FROM THE USE OF THIS SOFTWARE.
+@end smalldisplay
+
+@cdivider
+
+Portions extracted from Internet RFCs have the following copyright
+notice:
+
+@smalldisplay
+Copyright @copyright{} The Internet Society (2006).
+
+This document is subject to the rights, licenses and restrictions
+contained in BCP 78, and except as set forth therein, the authors
+retain all their rights.
+
+This document and the information contained herein are provided on an
+"AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE INTERNET
+ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+@end smalldisplay
+
+@cdivider
+
+@smalldisplay
+Copyright @copyright{} 1991, 1992, 1994 by Cygnus Support.
+
+Permission to use, copy, modify, and
+distribute this software and its documentation for any purpose and
+without fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright notice and
+this permission notice appear in supporting documentation.
+Cygnus Support makes no representations about the suitability of
+this software for any purpose.  It is provided "as is" without express
+or implied warranty.
+@end smalldisplay
+
+@cdivider
+
+@smalldisplay
+Copyright @copyright{} 2006 Secure Endpoints Inc.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY 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.
+@end smalldisplay
+
+@cdivider
+
+Portions of the implementation of the Fortuna-like PRNG are subject to
+the following notice:
+
+@smalldisplay
+Copyright @copyright{} 2005 Marko Kreen
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+@enumerate
+@item
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+@item
+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.
+@end enumerate
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR 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.
+@end smalldisplay
+
+@smalldisplay
+Copyright @copyright{} 1994 by the University of Southern California
+
+@quotation
+EXPORT OF THIS SOFTWARE from the United States of America may
+require a specific license from the United States Government.
+It is the responsibility of any person or organization contemplating
+export to obtain such a license before exporting.
 @end quotation
 
+WITHIN THAT CONSTRAINT, permission to copy, modify, and distribute
+this software and its documentation in source and binary forms is
+hereby granted, provided that any documentation or other materials
+related to such distribution or use acknowledge that the software
+was developed by the University of Southern California.
+
+DISCLAIMER OF WARRANTY.  THIS SOFTWARE IS PROVIDED "AS IS".  The
+University of Southern California MAKES NO REPRESENTATIONS OR
+WARRANTIES, EXPRESS OR IMPLIED.  By way of example, but not
+limitation, the University of Southern California MAKES NO
+REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE. The University of Southern
+California shall not be held liable for any liability nor for any
+direct, indirect, or consequential damages with respect to any
+claim by the user or distributor of the ksu software.
+@end smalldisplay
+
+@cdivider
+
+@smalldisplay
+Copyright @copyright{} 1995
+The President and Fellows of Harvard University
+
+This code is derived from software contributed to Harvard by
+Jeremy Rassen.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+@enumerate
+@item
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+@item
+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.
+@item
+All advertising materials mentioning features or use of this software
+must display the following acknowledgement:
+@quotation
+This product includes software developed by the University of
+California, Berkeley and its contributors.
+@end quotation
+@item
+Neither the name of the University nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+@end enumerate
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 THE REGENTS 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.
+@end smalldisplay
+
+@cdivider
+@smalldisplay
+Copyright @copyright{} 2008 by the Massachusetts Institute of Technology.
+Copyright 1995 by Richard P. Basch.  All Rights Reserved.
+Copyright 1995 by Lehman Brothers, Inc.  All Rights Reserved.
+
+@quotation
+Export of this software from the United States of America may
+require a specific license from the United States Government.
+It is the responsibility of any person or organization contemplating
+export to obtain such a license before exporting.
+@end quotation
+
+WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+distribute this software and its documentation for any purpose and
+without fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright notice and
+this permission notice appear in supporting documentation, and that
+the name of Richard P. Basch, Lehman Brothers and M.I.T. not be used
+in advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.  Richard P. Basch,
+Lehman Brothers and M.I.T. make no representations about the suitability
+of this software for any purpose.  It is provided "as is" without
+express or implied warranty.
+@end smalldisplay
+
+@cdivider
+
+The following notice applies to @code{src/lib/krb5/krb/strptime.c}:
+
+@smalldisplay
+Copyright @copyright{} 1997, 1998 The NetBSD Foundation, Inc.
+All rights reserved.
+
+This code was contributed to The NetBSD Foundation by Klaus Klein.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+@enumerate
+@item
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+@item
+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.
+@item
+All advertising materials mentioning features or use of this software
+must display the following acknowledgement:
+@quotation
+This product includes software developed by the NetBSD
+Foundation, Inc. and its contributors.
+@end quotation
+@item
+Neither the name of The NetBSD Foundation nor the names of its
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+@end enumerate
+
+THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 THE FOUNDATION 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.
+@end smalldisplay
+
+@cdivider
+
+The following notice applies to Unicode library files in
+@code{src/lib/krb5/unicode}:
+
+@smalldisplay
+Copyright 1997, 1998, 1999 Computing Research Labs,
+New Mexico State University
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
+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.
+@end smalldisplay
+
+@cdivider
+
+The following notice applies to @code{src/util/support/strlcpy.c}:
+
+@smalldisplay
+Copyright @copyright{} 1998 Todd C. Miller <Todd.Miller@@courtesan.com>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+@end smalldisplay
+
+@cdivider
+
+The following notice applies to @code{src/util/profile/argv_parse.c} and
+@code{src/util/profile/argv_parse.h}:
+
+@smalldisplay
+Copyright 1999 by Theodore Ts'o.
+
+Permission to use, copy, modify, and distribute this software for
+any purpose with or without fee is hereby granted, provided that
+the above copyright notice and this permission notice appear in all
+copies.  THE SOFTWARE IS PROVIDED "AS IS" AND THEODORE TS'O (THE
+AUTHOR) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  (Isn't
+it sick that the U.S. culture of lawsuit-happy lawyers requires
+this kind of disclaimer?)
+@end smalldisplay
+
+@cdivider
+
+The following notice applies to SWIG-generated code in
+@code{src/util/profile/profile_tcl.c}:
+
+@smalldisplay
+Copyright @copyright{} 1999-2000, The University of Chicago
+
+This file may be freely redistributed without license or fee provided
+this copyright message remains intact.
+@end smalldisplay
+
+@cdivider
+
+The following notice applies to portiions of @code{src/lib/rpc} and
+@code{src/include/gssrpc}:
+
+@smalldisplay
+Copyright @copyright{} 2000 The Regents of the University of Michigan.
+All rights reserved.
+
+Copyright @copyright{} 2000 Dug Song <dugsong@@UMICH.EDU>.
+All rights reserved, all wrongs reversed.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+@enumerate
+@item
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+@item
+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.
+@item
+Neither the name of the University nor the names of its
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+@end enumerate
+
+THIS SOFTWARE IS PROVIDED ``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 THE REGENTS 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.
+@end smalldisplay
+
+@cdivider
+
+Implementations of the MD4 algorithm are subject to the following
+notice:
+
+@smalldisplay
+Copyright @copyright{} 1990, RSA Data Security, Inc. All rights reserved.
+
+License to copy and use this software is granted provided that
+it is identified as the "RSA Data Security, Inc. MD4 Message
+Digest Algorithm" in all material mentioning or referencing this
+software or this function.
+
+License is also granted to make and use derivative works
+provided that such works are identified as "derived from the RSA
+Data Security, Inc. MD4 Message Digest Algorithm" in all
+material mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning
+either the merchantability of this software or the suitability
+of this software for any particular purpose.  It is provided "as
+is" without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+@end smalldisplay
+
+@cdivider
+
+Implementations of the MD5 algorithm are subject to the following
+notice:
+
+@smalldisplay
+Copyright @copyright{} 1990, RSA Data Security, Inc. All rights reserved.
+
+License to copy and use this software is granted provided that
+it is identified as the "RSA Data Security, Inc. MD5 Message-
+Digest Algorithm" in all material mentioning or referencing this
+software or this function.
+
+License is also granted to make and use derivative works
+provided that such works are identified as "derived from the RSA
+Data Security, Inc. MD5 Message-Digest Algorithm" in all
+material mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning
+either the merchantability of this software or the suitability
+of this software for any particular purpose.  It is provided "as
+is" without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+@end smalldisplay
+
+@cdivider
+
+The following notice applies to @code{src/lib/crypto/krb/crc32/crc32.c}:
+
+@smalldisplay
+Copyright @copyright{} 1990-2, RSA Data Security, Inc. Created 1990. All
+rights reserved.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+@end smalldisplay
+
+@cdivider
+Portions of @code{src/lib/krb5} are subject to the following notice:
+
+@smalldisplay
+Copyright @copyright{} 1994 CyberSAFE Corporation.
+Copyright 1990,1991,2007,2008 by the Massachusetts Institute of Technology.
+All Rights Reserved.
+
+@quotation
+Export of this software from the United States of America may
+require a specific license from the United States Government.
+It is the responsibility of any person or organization contemplating
+export to obtain such a license before exporting.
+@end quotation
+
+WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+distribute this software and its documentation for any purpose and
+without fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright notice and
+this permission notice appear in supporting documentation, and that
+the name of M.I.T. not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.  Furthermore if you modify this software you must label
+your software as modified software and not distribute it in such a
+fashion that it might be confused with the original M.I.T. software.
+Neither M.I.T., the Open Computing Security Group, nor
+CyberSAFE Corporation make any representations about the suitability of
+this software for any purpose.  It is provided "as is" without express
+or implied warranty.
+@end smalldisplay
+@ifclear noticefile
+
+@cdivider
+
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notices and this permission notice are
 preserved on all copies.
@@ -635,6 +1182,7 @@ permission notice identical to this one.
 
 Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions.
+@end ifclear
 @iftex
 @pagealignmacro
 @end iftex
diff --git a/doc/definitions.texinfo b/doc/definitions.texinfo
index 2db0add174..955c62837c 100644
--- a/doc/definitions.texinfo
+++ b/doc/definitions.texinfo
@@ -19,8 +19,8 @@
 @set RANDOMUSER johndoe
 @set RANDOMUSER1 jennifer
 @set RANDOMUSER2 david
-@set RELEASE 1.6
-@set PREVRELEASE 1.5
+@set RELEASE 1.9
+@set PREVRELEASE 1.8
 @set INSTALLDIR /usr/@value{LCPRODUCT}
 @set PREVINSTALLDIR @value{INSTALLDIR}
 @set ROOTDIR /usr/local
@@ -172,3 +172,21 @@ the following are based on variables in krb5/src/include/kerberosIV/krbports.h
 
 @comment lib/krb5/krb/vfy_increds.c
 @set DefaultVerifyApReqNofail not set
+
+@c copyright divider
+@macro cdivider
+@iftex
+@vskip 12pt
+@hrule
+@vskip 12pt
+@end iftex
+@ifinfo
+@center --------------------
+@sp 1
+@end ifinfo
+@ifhtml
+@html
+<hr>
+@end html
+@end ifhtml
+@end macro
diff --git a/doc/install.texinfo b/doc/install.texinfo
index 870f5250a9..920f9f7ee6 100644
--- a/doc/install.texinfo
+++ b/doc/install.texinfo
@@ -8,7 +8,11 @@
 @setchapternewpage odd                  @c chapter begins on next odd page
 @c @setchapternewpage on                   @c chapter begins on next page
 @c @smallbook                              @c Format for 7" X 9.25" paper
+@documentencoding UTF-8
 @c %**end of header
+@copying
+Copyright @copyright{} 1985-2010 by the Massachusetts Institute of Technology.
+@end copying
 
 @paragraphindent 0
 @iftex
@@ -34,16 +38,17 @@
 
 @page
 @vskip 0pt plus 1filll
-
+@insertcopying
 @end titlepage
 
-@node Top, Copyright, (dir), (dir)
+@node Top, Introduction, (dir), (dir)
 @comment  node-name,  next,  previous,  up
 
 @ifinfo
 This file documents how to install the @value{RELEASE} release of
 @value{PRODUCT}.
 
+@insertcopying
 @end ifinfo
 
 @c The master menu is updated using emacs19's M-x texinfo-all-menus-update
@@ -63,20 +68,16 @@ This file documents how to install the @value{RELEASE} release of
 @c ---------------------------------------------------------------------
 
 @menu
-* Copyright::                   
 * Introduction::                
 * Realm Configuration Decisions::  
 * Building Kerberos V5::        
 * Installing Kerberos V5::      
 * Upgrading Existing Kerberos V5 Installations::  
 * Bug Reports for Kerberos V5::  
+* Copyright::                   
 @end menu
 
-@node Copyright, Introduction, Top, Top
-@unnumbered Copyright
-@include copyright.texinfo
-
-@node Introduction, Realm Configuration Decisions, Copyright, Top
+@node Introduction, Realm Configuration Decisions, Top, Top
 @chapter Introduction
 
 @menu
@@ -1411,10 +1412,14 @@ lot of your application servers, and then change the default to include
 triple-DES and RC4.  We recommend that you always include
 @code{des-cbc-crc} in the default list.
 
-@node Bug Reports for Kerberos V5,  , Upgrading Existing Kerberos V5 Installations, Top
+@node Bug Reports for Kerberos V5, Copyright, Upgrading Existing Kerberos V5 Installations, Top
 @chapter Bug Reports for @value{PRODUCT}
 
 @include send-pr.texinfo
 
+@node Copyright,  , Bug Reports for Kerberos V5, Top
+@appendix Copyright
+@include copyright.texinfo
+
 @contents
 @bye
diff --git a/doc/notice.texinfo b/doc/notice.texinfo
new file mode 100644
index 0000000000..f26e1888bc
--- /dev/null
+++ b/doc/notice.texinfo
@@ -0,0 +1,10 @@
+\input texinfo
+@settitle Copyright and Other Legal Notices
+@paragraphindent 0
+@exampleindent 2
+@documentencoding UTF-8
+@set noticefile
+@node Top,  , (dir), (dir)
+@comment  node-name,  next,  previous,  up
+@include definitions.texinfo
+@include copyright.texinfo
diff --git a/doc/user-guide.texinfo b/doc/user-guide.texinfo
index 56f1c61ddf..4a507c4e33 100644
--- a/doc/user-guide.texinfo
+++ b/doc/user-guide.texinfo
@@ -6,7 +6,11 @@
 @setchapternewpage odd                  @c chapter begins on next odd page
 @c @setchapternewpage on                   @c chapter begins on next page
 @c @smallbook                              @c Format for 7" X 9.25" paper
+@documentencoding UTF-8
 @c %**end of header
+@copying
+Copyright @copyright{} 1985-2010 by the Massachusetts Institute of Technology.
+@end copying
 
 @paragraphindent 0
 @iftex
@@ -32,14 +36,16 @@
 
 @page
 @vskip 0pt plus 1filll
-
+@insertcopying
 @end titlepage
 
 @comment  node-name,  next,  previous,  up
-@node Top, Copyright, (dir), (dir)
+@node Top, Introduction, (dir), (dir)
 
 @ifinfo
 This file describes how to use the @value{PRODUCT} client programs.
+
+@insertcopying
 @end ifinfo
 
 @c The master menu is updated using emacs19's M-x texinfo-all-menus-update
@@ -56,19 +62,14 @@ This file describes how to use the @value{PRODUCT} client programs.
 @c ---------------------------------------------------------------------
 
 @menu
-* Copyright::                   
 * Introduction::                
 * Kerberos V5 Tutorial::        
 * Kerberos V5 Reference::       
 * Kerberos Glossary::           
+* Copyright::                   
 @end menu
 
-@node Copyright, Introduction, Top, Top
-@unnumbered Copyright
-
-@include copyright.texinfo
-
-@node Introduction, Kerberos V5 Tutorial, Copyright, Top
+@node Introduction, Kerberos V5 Tutorial, Top, Top
 @chapter Introduction
 
 @ifset CYGNUS
@@ -1671,7 +1672,7 @@ Type @kbd{M-x manual-entry rsh} to read this manual page.
 @end html
 @end ifhtml
 
-@node rcp Reference, , rsh Reference, Kerberos V5 Reference
+@node rcp Reference,  , rsh Reference, Kerberos V5 Reference
 @section rcp Reference
 
 @iftex
@@ -1696,10 +1697,15 @@ Type @kbd{M-x manual-entry rcp} to read this manual page.
 @end html
 @end ifhtml
 
-@node Kerberos Glossary,  , Kerberos V5 Reference, Top
+@node Kerberos Glossary, Copyright, Kerberos V5 Reference, Top
 @appendix Kerberos Glossary
 
 @include glossary.texinfo
 
+@node Copyright,  , Kerberos Glossary, Top
+@appendix Copyright
+
+@include copyright.texinfo
+
 @contents
 @bye