Formatting changes.licensing-nogpl

And, actually, a typo in catgconf.c.

Cherry-picked b712a6bf from branch 'licensing'.
Conflicts:

	LICENSE

37 files changed, 74 insertions, 74 deletions

diff --git a/LICENSE b/LICENSE
index 7a1a5a7..1cdfeac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 Radsecproxy is distributed under this license:
 
-* Copyright (c) 2006-2010, UNINETT AS.
-* Copyright (c) 2010-2012, NORDUnet A/S.
+* Copyright (c) 2006-2010, UNINETT AS
+* Copyright (c) 2010-2012, NORDUnet A/S
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
diff --git a/catgconf.c b/catgconf.c
index 9cb5380..c2be206 100644
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2013, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdio.h>
diff --git a/configure.ac b/configure.ac
index 97993b3..4326ecc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-dnl Copyright (c) 2006-2010, UNINETT AS.
-dnl Copyright (c) 2010-2012, NORDUnet A/S.
+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.6.1-dev, radsecproxy@uninett.no)
diff --git a/debug.c b/debug.c
index 3121f55..a9e4b36 100644
--- a/debug.c
+++ b/debug.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
diff --git a/debug.h b/debug.h
index e6f5cfd..b892b96 100644
--- a/debug.h
+++ b/debug.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
diff --git a/dtls.c b/dtls.c
index 9db68dc..9e769fc 100644
--- a/dtls.c
+++ b/dtls.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/dtls.h b/dtls.h
index 56441e5..27183db 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* 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 d84a2d6..4d4d2eb 100644
--- a/fticks.c
+++ b/fticks.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include "radsecproxy.h"
diff --git a/fticks.h b/fticks.h
index a2df432..dfc209f 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 int fticks_configure(struct options *options,
diff --git a/fticks_hashmac.c b/fticks_hashmac.c
index 4598a2a..c8ad0dc 100644
--- a/fticks_hashmac.c
+++ b/fticks_hashmac.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdio.h>
diff --git a/fticks_hashmac.h b/fticks_hashmac.h
index dda7dd2..9e06956 100644
--- a/fticks_hashmac.h
+++ b/fticks_hashmac.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdint.h>
diff --git a/gconfig.c b/gconfig.c
index 1cd9319..e58959b 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <string.h>
diff --git a/gconfig.h b/gconfig.h
index 1ec88fe..2cdda4f 100644
--- a/gconfig.h
+++ b/gconfig.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #define CONF_STR 1
diff --git a/hash.c b/hash.c
index ced88fc..51f039f 100644
--- a/hash.c
+++ b/hash.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdlib.h>
diff --git a/hash.h b/hash.h
index 1be4495..3c359e9 100644
--- a/hash.h
+++ b/hash.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
diff --git a/hostport.c b/hostport.c
index c8bdc9f..27b5b9f 100644
--- a/hostport.c
+++ b/hostport.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdlib.h>
diff --git a/hostport.h b/hostport.h
index 5498524..21b1979 100644
--- a/hostport.h
+++ b/hostport.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 struct hostportres {
diff --git a/list.c b/list.c
index 910ca9e..971daaf 100644
--- a/list.c
+++ b/list.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdlib.h>
diff --git a/list.h b/list.h
index 1c3fde2..cf63dce 100644
--- a/list.h
+++ b/list.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
diff --git a/main.c b/main.c
index 0a83ae7..9787d1e 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* 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 124f88c..258c9f9 100644
--- a/radmsg.c
+++ b/radmsg.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
diff --git a/radmsg.h b/radmsg.h
index a2a52da..cd83609 100644
--- a/radmsg.h
+++ b/radmsg.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #define RAD_Access_Request 1
diff --git a/radsecproxy-hash.c b/radsecproxy-hash.c
index 1b1d9e7..c9e2a7f 100644
--- a/radsecproxy-hash.c
+++ b/radsecproxy-hash.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdio.h>
diff --git a/radsecproxy.c b/radsecproxy.c
index 9346a37..d10d7a8 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* 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
diff --git a/radsecproxy.h b/radsecproxy.h
index cc3c333..6542e99 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <sys/time.h>
diff --git a/tcp.c b/tcp.c
index afc130b..f5dc274 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/tcp.h b/tcp.h
index 1517299..239e4a0 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* 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 b1ad89c..599e2a7 100644
--- a/tls.c
+++ b/tls.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/tls.h b/tls.h
index 45f6879..464fcae 100644
--- a/tls.h
+++ b/tls.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* 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 1bdfa1c..109cef0 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* 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)
diff --git a/tlscommon.h b/tlscommon.h
index 1517103..9e2ba02 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* 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 20e2939..8197e90 100644
--- a/tlv11.c
+++ b/tlv11.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
diff --git a/tlv11.h b/tlv11.h
index 489c01f..e5c653e 100644
--- a/tlv11.h
+++ b/tlv11.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 struct tlv {
diff --git a/udp.c b/udp.c
index 0942c0c..352b2f9 100644
--- a/udp.c
+++ b/udp.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/udp.h b/udp.h
index 80b4f83..7e5f038 100644
--- a/udp.h
+++ b/udp.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* 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 fb4217a..520abad 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <sys/socket.h>
diff --git a/util.h b/util.h
index 72863d7..eb5c27c 100644
--- a/util.h
+++ b/util.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS.
- * Copyright (c) 2010-2012, NORDUnet A/S. */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <sys/socket.h>