From: Linus Nordberg <linus@nordu.net>
Date: Mon, 17 Sep 2012 07:56:38 +0000 (+0200)
Subject: Remove the second copyright line, with both UNINETT and NORDUnet.
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=radsecproxy.git;a=commitdiff_plain;h=1c6043308251a2884892cfc726dde45ab115d326

Remove the second copyright line, with both UNINETT and NORDUnet.

The overlap is clearly expressed without it.
---

diff --git a/LICENSE b/LICENSE
index 08f8c5e..a2fdbad 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,4 @@
 Copyright (c) 2006-2010, UNINETT AS.
-Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
 Copyright (c) 2010-2012, NORDUnet A/S.
 
 The radsecproxy source code is subject to two licenses, you may pick
@@ -27,7 +26,6 @@ Alternatively the radsecproxy source code is subject to the terms of the
 below BSD style license.
 
 * Copyright (c) 2006-2010, UNINETT AS.
-* Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
 * Copyright (c) 2010-2012, NORDUnet A/S.
 * All rights reserved.
 *
diff --git a/catgconf.c b/catgconf.c
index ec9874a..9cb5380 100644
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2013, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/configure.ac b/configure.ac
index 544c781..97993b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,4 @@
 dnl Copyright (c) 2006-2010, UNINETT AS.
-dnl Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
 dnl Copyright (c) 2010-2012, NORDUnet A/S.
 dnl See LICENSE for licensing information.
 
diff --git a/debug.c b/debug.c
index 1a4e6bb..3121f55 100644
--- a/debug.c
+++ b/debug.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/debug.h b/debug.h
index aa02ae8..e6f5cfd 100644
--- a/debug.h
+++ b/debug.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/dtls.c b/dtls.c
index 959f73f..9db68dc 100644
--- a/dtls.c
+++ b/dtls.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/dtls.h b/dtls.h
index d79511c..56441e5 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/fticks.c b/fticks.c
index 54ec8bf..d84a2d6 100644
--- a/fticks.c
+++ b/fticks.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/fticks.h b/fticks.h
index e6e1217..a2df432 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/fticks_hashmac.c b/fticks_hashmac.c
index 1ddd212..4598a2a 100644
--- a/fticks_hashmac.c
+++ b/fticks_hashmac.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/fticks_hashmac.h b/fticks_hashmac.h
index c1085af..dda7dd2 100644
--- a/fticks_hashmac.h
+++ b/fticks_hashmac.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/gconfig.c b/gconfig.c
index 8a47f46..1cd9319 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/gconfig.h b/gconfig.h
index cfe04b4..1ec88fe 100644
--- a/gconfig.h
+++ b/gconfig.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/hash.c b/hash.c
index 0a6e348..ced88fc 100644
--- a/hash.c
+++ b/hash.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/hash.h b/hash.h
index d3b0d1f..1be4495 100644
--- a/hash.h
+++ b/hash.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/hostport.c b/hostport.c
index c31bb17..7211ac4 100644
--- a/hostport.c
+++ b/hostport.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/hostport.h b/hostport.h
index 0093e27..5498524 100644
--- a/hostport.h
+++ b/hostport.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/list.c b/list.c
index 00f4029..910ca9e 100644
--- a/list.c
+++ b/list.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/list.h b/list.h
index 4939d06..1c3fde2 100644
--- a/list.h
+++ b/list.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/main.c b/main.c
index c205f92..0a83ae7 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radmsg.c b/radmsg.c
index 1f374d7..124f88c 100644
--- a/radmsg.c
+++ b/radmsg.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radmsg.h b/radmsg.h
index b4baedb..a2a52da 100644
--- a/radmsg.h
+++ b/radmsg.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radsecproxy-hash.c b/radsecproxy-hash.c
index cf4e448..1b1d9e7 100644
--- a/radsecproxy-hash.c
+++ b/radsecproxy-hash.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radsecproxy.c b/radsecproxy.c
index 69e369f..1cc477a 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/radsecproxy.h b/radsecproxy.h
index ade6fe2..cc3c333 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tcp.c b/tcp.c
index 567de25..afc130b 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tcp.h b/tcp.h
index 67b3ddd..1517299 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tls.c b/tls.c
index 4953e98..b1ad89c 100644
--- a/tls.c
+++ b/tls.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tls.h b/tls.h
index ed571c6..45f6879 100644
--- a/tls.h
+++ b/tls.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tlscommon.c b/tlscommon.c
index 9768d1f..1bdfa1c 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tlscommon.h b/tlscommon.h
index 98842e1..1517103 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tlv11.c b/tlv11.c
index 8f98244..20e2939 100644
--- a/tlv11.c
+++ b/tlv11.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/tlv11.h b/tlv11.h
index 20ffd6c..489c01f 100644
--- a/tlv11.h
+++ b/tlv11.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/udp.c b/udp.c
index 4bc85f1..0942c0c 100644
--- a/udp.c
+++ b/udp.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/udp.h b/udp.h
index cf6966e..80b4f83 100644
--- a/udp.h
+++ b/udp.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/util.c b/util.c
index ce59a96..b5d40c9 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */
 
diff --git a/util.h b/util.h
index 97d40e0..72863d7 100644
--- a/util.h
+++ b/util.h
@@ -1,5 +1,4 @@
 /* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
  * Copyright (c) 2010-2012, NORDUnet A/S. */
 /* See LICENSE for licensing information. */