summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--catgconf.c12
-rw-r--r--debug.c12
-rw-r--r--debug.h12
-rw-r--r--dtls.c11
-rw-r--r--dtls.h11
-rw-r--r--fticks.c7
-rw-r--r--fticks.h7
-rw-r--r--fticks_hashmac.c7
-rw-r--r--fticks_hashmac.h7
-rw-r--r--gconfig.c11
-rw-r--r--hash.c11
-rw-r--r--hash.h11
-rw-r--r--hostport.c11
-rw-r--r--hostport.h11
-rw-r--r--list.c11
-rw-r--r--list.h11
-rw-r--r--main.c7
-rw-r--r--radmsg.c11
-rw-r--r--radmsg.h11
-rw-r--r--radsecproxy-hash.c11
-rw-r--r--radsecproxy.c12
-rw-r--r--radsecproxy.h12
-rw-r--r--tcp.c11
-rw-r--r--tcp.h11
-rw-r--r--tls.c11
-rw-r--r--tls.h11
-rw-r--r--tlscommon.c12
-rw-r--r--tlscommon.h11
-rw-r--r--tlv11.c12
-rw-r--r--tlv11.h12
-rw-r--r--udp.c11
-rw-r--r--udp.h11
-rw-r--r--util.c11
-rw-r--r--util.h11
34 files changed, 136 insertions, 226 deletions
diff --git a/catgconf.c b/catgconf.c
index 42b1d40..59e9e52 100644
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,11 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2013, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
#include <stdio.h>
#include <string.h>
diff --git a/debug.c b/debug.c
index 4f6f59e..9e0a4eb 100644
--- a/debug.c
+++ b/debug.c
@@ -1,11 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..7ed9945 100644
--- a/debug.h
+++ b/debug.h
@@ -1,11 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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 bbebfef..24dbe8c 100644
--- a/dtls.c
+++ b/dtls.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..fd7aae7 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..a04f49d 100644
--- a/fticks.c
+++ b/fticks.c
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..70a1be9 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..aeb4c7d 100644
--- a/fticks_hashmac.c
+++ b/fticks_hashmac.c
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..564815d 100644
--- a/fticks_hashmac.h
+++ b/fticks_hashmac.h
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..5d60de7 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
#include <string.h>
#include <stdarg.h>
diff --git a/hash.c b/hash.c
index fd3c04b..9c16def 100644
--- a/hash.c
+++ b/hash.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..7a2652a 100644
--- a/hash.h
+++ b/hash.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..3bcb1c8 100644
--- a/hostport.c
+++ b/hostport.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
/* Code contributions from:
*
diff --git a/hostport.h b/hostport.h
index 207e2ba..d9ea9e4 100644
--- a/hostport.h
+++ b/hostport.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..26f0fd2 100644
--- a/list.c
+++ b/list.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..e545191 100644
--- a/list.h
+++ b/list.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..c2ecf08 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,7 @@
-/* Copyright (C) 2011 NORDUnet A/S
- * See LICENSE for information about licensing.
- */
+/* Copyright (c) 2006-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..356e024 100644
--- a/radmsg.c
+++ b/radmsg.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..97801b3 100644
--- a/radmsg.h
+++ b/radmsg.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..24cf236 100644
--- a/radsecproxy-hash.c
+++ b/radsecproxy-hash.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..a92fcd1 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1,11 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
/* Code contributions from:
*
diff --git a/radsecproxy.h b/radsecproxy.h
index 1e9dc42..fa16baa 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,11 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..0e03f52 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..5e3901d 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..0330848 100644
--- a/tls.c
+++ b/tls.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..725e8cd 100644
--- a/tls.h
+++ b/tls.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..59c2045 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -1,11 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..40e2d05 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..77db16d 100644
--- a/tlv11.c
+++ b/tlv11.c
@@ -1,11 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..9f4a34e 100644
--- a/tlv11.h
+++ b/tlv11.h
@@ -1,11 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..a6b8bc2 100644
--- a/udp.c
+++ b/udp.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..11fff53 100644
--- a/udp.h
+++ b/udp.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * 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..9aa77bd 100644
--- a/util.c
+++ b/util.c
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
/* Code contributions from:
*
diff --git a/util.h b/util.h
index c421505..0cd6621 100644
--- a/util.h
+++ b/util.h
@@ -1,10 +1,7 @@
-/*
- * 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-2009, Stig Venaas, UNINETT AS.
+ * Copyright (c) 2010, UNINETT AS, NORDUnet A/S.
+ * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* See LICENSE for licensing information. */
#include <sys/socket.h>
#include <netdb.h>