From dd7a705fb21e4df1d909e4fb1b65519f0f9399a0 Mon Sep 17 00:00:00 2001
From: Timothy Stack <stack@flux.utah.edu>
Date: Fri, 5 Nov 2004 17:53:58 +0000
Subject: [PATCH] Fix copyrights

---
 sensors/canaryd/canaryd.c          | 9 ++-------
 sensors/canaryd/canarydEvents.c    | 9 ++-------
 sensors/canaryd/canarydEvents.h    | 9 ++-------
 sensors/canaryd/childProcess.c     | 9 ++-------
 sensors/canaryd/childProcess.h     | 9 ++-------
 sensors/canaryd/networkInterface.c | 9 ++-------
 sensors/canaryd/networkInterface.h | 9 ++-------
 sensors/slothd/digest-slothd       | 6 ++++++
 sensors/slothd/webfeedback.in      | 6 ++++++
 9 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/sensors/canaryd/canaryd.c b/sensors/canaryd/canaryd.c
index 0cf1a5e0f3..46d374a6f5 100644
--- a/sensors/canaryd/canaryd.c
+++ b/sensors/canaryd/canaryd.c
@@ -1,12 +1,7 @@
 /*
- * canaryd.c
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 University of Utah and the Flux Group.
  * All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.  
- * See the file "license.terms" for restrictions on redistribution 
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /**
diff --git a/sensors/canaryd/canarydEvents.c b/sensors/canaryd/canarydEvents.c
index df810dad70..7190ee6b6e 100644
--- a/sensors/canaryd/canarydEvents.c
+++ b/sensors/canaryd/canarydEvents.c
@@ -1,12 +1,7 @@
 /*
- * canarydEvents.c
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 University of Utah and the Flux Group.
  * All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.  
- * See the file "license.terms" for restrictions on redistribution 
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /**
diff --git a/sensors/canaryd/canarydEvents.h b/sensors/canaryd/canarydEvents.h
index dbc8794b11..0cc3aae544 100644
--- a/sensors/canaryd/canarydEvents.h
+++ b/sensors/canaryd/canarydEvents.h
@@ -1,12 +1,7 @@
 /*
- * canarydEvents.h
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 University of Utah and the Flux Group.
  * All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.  
- * See the file "license.terms" for restrictions on redistribution 
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /**
diff --git a/sensors/canaryd/childProcess.c b/sensors/canaryd/childProcess.c
index 959a4f15af..949a2054ae 100644
--- a/sensors/canaryd/childProcess.c
+++ b/sensors/canaryd/childProcess.c
@@ -1,12 +1,7 @@
 /*
- * childProcess.c
- *
- * Copyright (c) 2003, 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2003-2004 University of Utah and the Flux Group.
  * All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.  
- * See the file "license.terms" for restrictions on redistribution 
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /**
diff --git a/sensors/canaryd/childProcess.h b/sensors/canaryd/childProcess.h
index d324e580c8..da08d3ee98 100644
--- a/sensors/canaryd/childProcess.h
+++ b/sensors/canaryd/childProcess.h
@@ -1,12 +1,7 @@
 /*
- * childProcess.h
- *
- * Copyright (c) 2003, 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2003-2004 University of Utah and the Flux Group.
  * All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.  
- * See the file "license.terms" for restrictions on redistribution 
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /**
diff --git a/sensors/canaryd/networkInterface.c b/sensors/canaryd/networkInterface.c
index cf5fa79d6f..8db1677181 100644
--- a/sensors/canaryd/networkInterface.c
+++ b/sensors/canaryd/networkInterface.c
@@ -1,12 +1,7 @@
 /*
- * networkInterface.c
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 University of Utah and the Flux Group.
  * All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.  
- * See the file "license.terms" for restrictions on redistribution 
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /**
diff --git a/sensors/canaryd/networkInterface.h b/sensors/canaryd/networkInterface.h
index 8f3b925e76..25495fe8ec 100644
--- a/sensors/canaryd/networkInterface.h
+++ b/sensors/canaryd/networkInterface.h
@@ -1,12 +1,7 @@
 /*
- * networkInterface.h
- *
- * Copyright (c) 2004 The University of Utah and the Flux Group.
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2000-2004 University of Utah and the Flux Group.
  * All rights reserved.
- *
- * This file is licensed under the terms of the GNU Public License.  
- * See the file "license.terms" for restrictions on redistribution 
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /**
diff --git a/sensors/slothd/digest-slothd b/sensors/slothd/digest-slothd
index 2c0bf062eb..bf19efe244 100644
--- a/sensors/slothd/digest-slothd
+++ b/sensors/slothd/digest-slothd
@@ -1,5 +1,11 @@
 #! /usr/bin/awk -f
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # Digest slothd logs and generate a TCL file that contains resource usage data
 # that can be fed back into the mapper.
diff --git a/sensors/slothd/webfeedback.in b/sensors/slothd/webfeedback.in
index b8c77cb8dc..964670df09 100644
--- a/sensors/slothd/webfeedback.in
+++ b/sensors/slothd/webfeedback.in
@@ -1,5 +1,11 @@
 #! /usr/bin/perl -wT
 
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 use English;
 use Getopt::Std;
 use Socket;
-- 
GitLab