Merge branch 'licensing-nogpl'

Conflicts:
	configure.ac

38 files changed, 118 insertions, 261 deletions

diff --git a/COPYING b/COPYING
deleted file mode 100644
index a0b8800..0000000
--- a/COPYING
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
-
-See the LICENSE file for licensing terms.
diff --git a/LICENSE b/LICENSE
index 35c2b98..1cdfeac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1,7 @@
-The radsecproxy source code is subject to two licenses, you may pick
-the one that best suits your needs.
-
-The radsecproxy source code is subject to the terms of the GNU General
-Public License Version 2 or later (GPL).
-
-Alternatively the radsecproxy source code is subject to the terms of the
-below BSD style license.
+Radsecproxy is distributed under this license:
 
 * Copyright (c) 2006-2010, UNINETT AS
-* Copyright (c) 2010,2011, NORDUnet A/S
+* Copyright (c) 2010-2012, NORDUnet A/S
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -18,14 +11,15 @@ below BSD style license.
 *     * 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  distribution.
-*     * Neither the name of the UNINETT AS 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 NORDUnet A/S 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 UNINETT AS ``AS IS'' AND ANY
+* THIS SOFTWARE IS PROVIDED BY NORDUNET AS ``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 UNINETT AS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL NORDUNET AS 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
diff --git a/catgconf.c b/catgconf.c
index 42b1d40..c2be206 100644
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011,2012 NORDUnet A/S
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/configure.ac b/configure.ac
index 9ba93f5..e5df020 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,7 @@
+dnl Copyright (c) 2006-2010, UNINETT AS
+dnl Copyright (c) 2010-2012, NORDUnet A/S
+dnl See LICENSE for licensing information.
+
 AC_INIT(radsecproxy, 1.7-dev, radsecproxy@uninett.no)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
diff --git a/debug.c b/debug.c
index 4f6f59e..a9e4b36 100644
--- a/debug.c
+++ b/debug.c
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 2007 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011 NORDUnet A/S
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
 #include <stdint.h>
diff --git a/debug.h b/debug.h
index 08c655d..b892b96 100644
--- a/debug.h
+++ b/debug.h
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 2007 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011 NORDUnet A/S
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
 #include <stdint.h>
diff --git a/dtls.c b/dtls.c
index 3772113..fdc99ab 100644
--- a/dtls.c
+++ b/dtls.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2008-2009 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <signal.h>
 #include <sys/socket.h>
diff --git a/dtls.h b/dtls.h
index 3426e63..27183db 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 const struct protodefs *dtlsinit(uint8_t h);
 
diff --git a/fticks.c b/fticks.c
index 43b37fe..4d4d2eb 100644
--- a/fticks.c
+++ b/fticks.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include "radsecproxy.h"
 #include "debug.h"
diff --git a/fticks.h b/fticks.h
index d302cf0..dfc209f 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 int fticks_configure(struct options *options,
 		     uint8_t **reportingp,
diff --git a/fticks_hashmac.c b/fticks_hashmac.c
index bc7b8ba..c8ad0dc 100644
--- a/fticks_hashmac.c
+++ b/fticks_hashmac.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fticks_hashmac.h b/fticks_hashmac.h
index 2c031e1..9e06956 100644
--- a/fticks_hashmac.h
+++ b/fticks_hashmac.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/gconfig.c b/gconfig.c
index b7107aa..e58959b 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2007, 2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <string.h>
 #include <stdarg.h>
diff --git a/gconfig.h b/gconfig.h
index 463ebdf..2cdda4f 100644
--- a/gconfig.h
+++ b/gconfig.h
@@ -1,3 +1,7 @@
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
+
 #define CONF_STR 1
 #define CONF_CBK 2
 #define CONF_MSTR 3
diff --git a/hash.c b/hash.c
index fd3c04b..51f039f 100644
--- a/hash.c
+++ b/hash.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/hash.h b/hash.h
index 48f54a3..3c359e9 100644
--- a/hash.h
+++ b/hash.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
 #include <stdint.h>
diff --git a/hostport.c b/hostport.c
index 4214c55..27b5b9f 100644
--- a/hostport.c
+++ b/hostport.c
@@ -1,15 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
-
-/* Code contributions from:
- *
- * Simon Leinen <simon.leinen@switch.ch>
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/hostport.h b/hostport.h
index 207e2ba..21b1979 100644
--- a/hostport.h
+++ b/hostport.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 struct hostportres {
     char *host;
diff --git a/list.c b/list.c
index 58ab7aa..971daaf 100644
--- a/list.c
+++ b/list.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/list.h b/list.h
index 80c0128..cf63dce 100644
--- a/list.h
+++ b/list.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
 #include <sys/inttypes.h>
diff --git a/main.c b/main.c
index e2ed409..9787d1e 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 int radsecproxy_main(int argc, char **argv);
 
diff --git a/radmsg.c b/radmsg.c
index 0a46e71..258c9f9 100644
--- a/radmsg.c
+++ b/radmsg.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
 #include <sys/inttypes.h>
diff --git a/radmsg.h b/radmsg.h
index 8219a5c..cd83609 100644
--- a/radmsg.h
+++ b/radmsg.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #define RAD_Access_Request 1
 #define RAD_Access_Accept 2
diff --git a/radsecproxy-hash.c b/radsecproxy-hash.c
index 48b3845..c9e2a7f 100644
--- a/radsecproxy-hash.c
+++ b/radsecproxy-hash.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2011 NORDUnet A/S
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/radsecproxy.c b/radsecproxy.c
index 8489a18..d10d7a8 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1,19 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011,2012 NORDUnet A/S
- *
- * 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.
- */
-
-/* Code contributions from:
- *
- * Arne Schwabe <schwabe at uni-paderborn.de>
- * Maja Wolniewicz <mgw@umk.pl>
- * Simon Leinen <simon.leinen@switch.ch>
- * Stefan Winter <stefan.winter@restena.lu>
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 /* For UDP there is one server instance consisting of udpserverrd and udpserverth
  *              rd is responsible for init and launching wr
diff --git a/radsecproxy.h b/radsecproxy.h
index 1e9dc42..6542e99 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011,2012 NORDUnet A/S
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <sys/time.h>
 #include <stdint.h>
diff --git a/tcp.c b/tcp.c
index 86fa9b6..f5dc274 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2008-2009 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <signal.h>
 #include <sys/socket.h>
diff --git a/tcp.h b/tcp.h
index c388895..239e4a0 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 const struct protodefs *tcpinit(uint8_t h);
 
diff --git a/tls.c b/tls.c
index 084c0ce..599e2a7 100644
--- a/tls.c
+++ b/tls.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <signal.h>
 #include <sys/socket.h>
diff --git a/tls.h b/tls.h
index 1a8735e..464fcae 100644
--- a/tls.h
+++ b/tls.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 const struct protodefs *tlsinit(uint8_t h);
 
diff --git a/tlscommon.c b/tlscommon.c
index 13a140a..109cef0 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010,2011 NORDUnet A/S
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
 #include <signal.h>
diff --git a/tlscommon.h b/tlscommon.h
index 084cb1c..9e2ba02 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <openssl/ssl.h>
 
diff --git a/tlv11.c b/tlv11.c
index 94768cf..8197e90 100644
--- a/tlv11.c
+++ b/tlv11.c
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010 NORDUnet A/S
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
 #include <sys/inttypes.h>
diff --git a/tlv11.h b/tlv11.h
index d8bd3c5..e5c653e 100644
--- a/tlv11.h
+++ b/tlv11.h
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- * Copyright (C) 2010 NORDUnet A/S
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 struct tlv {
     uint8_t t;
diff --git a/udp.c b/udp.c
index c804703..352b2f9 100644
--- a/udp.c
+++ b/udp.c
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <signal.h>
 #include <sys/socket.h>
diff --git a/udp.h b/udp.h
index 8f26e15..7e5f038 100644
--- a/udp.h
+++ b/udp.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 const struct protodefs *udpinit(uint8_t h);
 
diff --git a/util.c b/util.c
index dc36ed9..520abad 100644
--- a/util.c
+++ b/util.c
@@ -1,15 +1,6 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
-
-/* Code contributions from:
- *
- * Stefan Winter <stefan.winter@restena.lu>
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/util.h b/util.h
index c421505..eb5c27c 100644
--- a/util.h
+++ b/util.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
- *
- * 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.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 #include <sys/socket.h>
 #include <netdb.h>