ka-forwarder-licensing-20070508

ka-forwarder is under a different copyright not previously covered, so
embed the actual licensing in the source rather than referring to a file
that doesn't exist and add the relevant information to the LICENSE files.

diff --git a/doc/LICENSE b/doc/LICENSE
index ce8ad3f..a442d1b 100644 (file)
--- a/doc/LICENSE
+++ b/doc/LICENSE
@@ -291,6 +291,32 @@ Some code in rxkad/ticket5.c is subject to the following copyright:
  * or implied warranty.
  */
 
+aklog/ka-forwarder.c is subject to the following copyright:
+/*
+ * Copyright (c) 1993 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * 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, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+
 afssettings is subject to the following license:
 APPLE PUBLIC SOURCE LICENSE
 Version 2.0 - August 6, 2003

diff --git a/src/LICENSE b/src/LICENSE
index ce8ad3f..36a54eb 100644 (file)
--- a/src/LICENSE
+++ b/src/LICENSE
@@ -291,6 +291,32 @@ Some code in rxkad/ticket5.c is subject to the following copyright:
  * or implied warranty.
  */
 
+aklog/ka-forwarder.c is subject to the following copyright:
+/*
+ * Copyright (c) 1993 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * 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, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+
 afssettings is subject to the following license:
 APPLE PUBLIC SOURCE LICENSE
 Version 2.0 - August 6, 2003
@@ -691,4 +717,5 @@ Some portions of Rx are subject to the following license:
  * Mountain View, California  94043
  */
 
-src/afs/LINUX/osi_flush.s included code under IBM Public License with permission of the author, Paul MacKerras.
+src/afs/LINUX/osi_flush.s included code under IBM Public License with
+permission of the author, Paul MacKerras.

diff --git a/src/kauth/ka-forwarder.c b/src/kauth/ka-forwarder.c
index 19e0465..326f1b3 100644 (file)
--- a/src/kauth/ka-forwarder.c
+++ b/src/kauth/ka-forwarder.c
@@ -2,46 +2,26 @@
  * COPYRIGHT NOTICE
  * Copyright (c) 1994 Carnegie Mellon University
  * All Rights Reserved.
- * 
- * See <cmu_copyright.h> for use and distribution information.
- */
-
-/*
- * HISTORY
- * $Log$
- * Revision 1.1  2006/07/31 17:34:26  rra
- * DELTA ka-forwarder-20060731
- * AUTHOR rra@stanford.edu
  *
- * Add ka-forwarder.
+ * 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, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  *
- * Revision 1.1  1997/06/03 18:23:54  kenh
- * .
+ * Carnegie Mellon requests users of this software to return to
  *
- * Revision 1.4  1996/08/09  01:00:21  jhutz
- *     When initializing the array of fakeka servers, remember to set
- *     the address family of each server; otherwise SunOS complains.
- *     [1996/08/09  00:58:46  jhutz]
+ *  Software Distribution Coordinator  or  Software_Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
  *
- * Revision 1.3  1996/08/09  00:17:19  jhutz
- *     Merged in changes from Chuck Silvers:
- *     - Support for more than one fakeka server
- *     - Support for specifying ports for each fakeka server separately from the
- *       others, and from the port we listen on.
- * 
- *     Plus a minor bug fix to Chuck's code.
- *     Basically, this version is designed to provide both reliability and
- *     load-balancing cheaply.  Basically, we forward packets to all of the
- *     fakeka servers in round-robin fashion.  So, if a client is losing on
- *     one server, its retry should go to a different one, if more than one
- *     is specified.
- *     [1996/08/03  02:13:36  jhutz]
- * 
- * Revision 1.2  1995/02/23  18:26:36  chs
- *     Created.
- *     [1995/02/23  18:26:03  chs]
- * 
- * $EndLog$
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
  */
 
 /*