From d9dad55d901413986231b8c6500947f3151f5ea7 Mon Sep 17 00:00:00 2001
From: Mike Hibler <mike@flux.utah.edu>
Date: Tue, 5 Dec 2006 18:24:00 +0000
Subject: [PATCH] Hopefully my last copyright pass!

---
 install/newnode_sshkeys/GNUmakefile.in | 4 ++++
 tbsetup/ns2ir/elabinelab-withfsnode.ns | 6 ++++++
 tbsetup/ns2ir/elabinelab.ns            | 6 ++++++
 tbsetup/ns2ir/fw.ns                    | 6 ++++++
 tbsetup/plab/etc/fixsudo.sh            | 5 +++++
 tbsetup/plab/plabmon_badpool.pm.in     | 2 +-
 tbsetup/plab/plabmon_goodpool.pm.in    | 2 +-
 tbsetup/plab/procmail.plab             | 5 +++++
 testsuite/test-defs                    | 6 ++++++
 utils/node_testsuite                   | 5 +++++
 utils/tbbuildkernels                   | 6 ++++++
 utils/withadminprivs                   | 6 ++++++
 www/doc/users.html                     | 6 ++++++
 www/error.shtml                        | 6 ++++++
 www/ssh-mime.c                         | 6 ++++++
 15 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/install/newnode_sshkeys/GNUmakefile.in b/install/newnode_sshkeys/GNUmakefile.in
index 5503b89f8c..37b3e0e321 100644
--- a/install/newnode_sshkeys/GNUmakefile.in
+++ b/install/newnode_sshkeys/GNUmakefile.in
@@ -1,4 +1,8 @@
 #
+# EMULAB-COPYRIGHT
+# Copyright (c) 2003 University of Utah and the Flux Group.
+# All rights reserved.
+#
 # For installation.
 #
 SRCDIR		= @srcdir@
diff --git a/tbsetup/ns2ir/elabinelab-withfsnode.ns b/tbsetup/ns2ir/elabinelab-withfsnode.ns
index 2c22d208a9..db2330879b 100644
--- a/tbsetup/ns2ir/elabinelab-withfsnode.ns
+++ b/tbsetup/ns2ir/elabinelab-withfsnode.ns
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004-2006 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # This file is intended to be included into another NS file. It is not
 # a stand alone file.
diff --git a/tbsetup/ns2ir/elabinelab.ns b/tbsetup/ns2ir/elabinelab.ns
index 07f70040f5..a1eb13f115 100644
--- a/tbsetup/ns2ir/elabinelab.ns
+++ b/tbsetup/ns2ir/elabinelab.ns
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004-2006 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # This file is intended to be included into another NS file. It is not
 # a stand alone file.
diff --git a/tbsetup/ns2ir/fw.ns b/tbsetup/ns2ir/fw.ns
index 19122dfaaf..83e219c545 100644
--- a/tbsetup/ns2ir/fw.ns
+++ b/tbsetup/ns2ir/fw.ns
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004-2006 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # This file is intended to be included into another NS file. It is not
 # a stand alone file.
diff --git a/tbsetup/plab/etc/fixsudo.sh b/tbsetup/plab/etc/fixsudo.sh
index bb3c3a67bb..38bb3a027b 100755
--- a/tbsetup/plab/etc/fixsudo.sh
+++ b/tbsetup/plab/etc/fixsudo.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2004 University of Utah and the Flux Group.
+# All rights reserved.
+#
 
 TMPSUDOERS=/tmp/sudoers
 ME=`whoami`
diff --git a/tbsetup/plab/plabmon_badpool.pm.in b/tbsetup/plab/plabmon_badpool.pm.in
index f43972c7f0..3443f5f4a4 100644
--- a/tbsetup/plab/plabmon_badpool.pm.in
+++ b/tbsetup/plab/plabmon_badpool.pm.in
@@ -1,6 +1,6 @@
 # -*- perl -*-
 #
-# EMULAB-LGPL
+# EMULAB-COPYRIGHT
 # Copyright (c) 2000-2005 University of Utah and the Flux Group.
 # All rights reserved.
 #
diff --git a/tbsetup/plab/plabmon_goodpool.pm.in b/tbsetup/plab/plabmon_goodpool.pm.in
index e5b3898fd0..6a5329a1e1 100644
--- a/tbsetup/plab/plabmon_goodpool.pm.in
+++ b/tbsetup/plab/plabmon_goodpool.pm.in
@@ -1,6 +1,6 @@
 # -*- perl -*-
 #
-# EMULAB-LGPL
+# EMULAB-COPYRIGHT
 # Copyright (c) 2000-2005 University of Utah and the Flux Group.
 # All rights reserved.
 #
diff --git a/tbsetup/plab/procmail.plab b/tbsetup/plab/procmail.plab
index f0da0a9ff2..c8de9b7ef0 100644
--- a/tbsetup/plab/procmail.plab
+++ b/tbsetup/plab/procmail.plab
@@ -1,3 +1,8 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2006 University of Utah and the Flux Group.
+# All rights reserved.
+#
 LOGFILE=/tmp/procmail-slice-plab.log
 VERBOSE=on
 SLICE_ALIAS_DIR=/etc/mail/plab-slice-addrs
diff --git a/testsuite/test-defs b/testsuite/test-defs
index 8b9e9ecb16..5bd72fc787 100644
--- a/testsuite/test-defs
+++ b/testsuite/test-defs
@@ -1,3 +1,9 @@
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2003 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # This is the defaults definitions file for configure.
 #
diff --git a/utils/node_testsuite b/utils/node_testsuite
index 894ae79268..c0f78cae5b 100755
--- a/utils/node_testsuite
+++ b/utils/node_testsuite
@@ -1,4 +1,9 @@
 #!/usr/bin/perl -w
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2003, 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
 
 use strict;
 
diff --git a/utils/tbbuildkernels b/utils/tbbuildkernels
index fee35616b5..a4473eef9d 100755
--- a/utils/tbbuildkernels
+++ b/utils/tbbuildkernels
@@ -1,4 +1,10 @@
 #!/usr/bin/perl -w
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2005 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # tbbuildkernels - a little script for building and installing the
 #
diff --git a/utils/withadminprivs b/utils/withadminprivs
index b03846c490..844763aafc 100644
--- a/utils/withadminprivs
+++ b/utils/withadminprivs
@@ -1,4 +1,10 @@
 #!/bin/sh
+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2002 University of Utah and the Flux Group.
+# All rights reserved.
+#
+
 #
 # Simple script to run a command with testbed admin privs turned on
 #
diff --git a/www/doc/users.html b/www/doc/users.html
index 7c23eec53f..e1234557bf 100644
--- a/www/doc/users.html
+++ b/www/doc/users.html
@@ -1,3 +1,9 @@
+<!--
+   EMULAB-COPYRIGHT
+   Copyright (c) 2003 University of Utah and the Flux Group.
+   All rights reserved.
+  -->
+<!--- This exists to redirect to the PHP script -->
 <ul>
 <li>
 <font size="+1">
diff --git a/www/error.shtml b/www/error.shtml
index ca5037f33b..6034a1cc6f 100644
--- a/www/error.shtml
+++ b/www/error.shtml
@@ -1,3 +1,9 @@
+<!--
+   EMULAB-COPYRIGHT
+   Copyright (c) 2001-2003 University of Utah and the Flux Group.
+   All rights reserved.
+  -->
+<!--- This exists to redirect to the PHP script -->
 <html>
 <head>
 	<title>Emulab.Net - Access Error</title>
diff --git a/www/ssh-mime.c b/www/ssh-mime.c
index 97a70c44b0..d70e3bb100 100644
--- a/www/ssh-mime.c
+++ b/www/ssh-mime.c
@@ -1,3 +1,9 @@
+/*
+ * EMULAB-COPYRIGHT
+ * Copyright (c) 2004 University of Utah and the Flux Group.
+ * All rights reserved.
+ */
+
 /* Compile on cygwin with gcc -mwindows -mno-cygwin -o ssh-mime ssh-mime.c */
 /* Set the env PUTTY_CMD to the path of where you have put putty */
 #include <stdio.h>
-- 
GitLab