Skip to content

Commit

Permalink
Formatting changes.
Browse files Browse the repository at this point in the history 
And, actually, a typo in catgconf.c.

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

	LICENSE
  • Loading branch information
Linus Nordberg committed Sep 25, 2012
1 parent 896ace8 commit 9142e68
Show file tree
Hide file tree
Showing 37 changed files with 74 additions and 74 deletions.
4 changes: 2 additions & 2 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions catgconf.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions debug.c
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions debug.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions dtls.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions dtls.h
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions fticks.c
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions fticks.h
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions fticks_hashmac.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions fticks_hashmac.h
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions gconfig.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions gconfig.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions hash.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions hash.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions hostport.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions hostport.h
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions list.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions list.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions main.c
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions radmsg.c
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions radmsg.h
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions radsecproxy-hash.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions radsecproxy.c
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions radsecproxy.h
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions tcp.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions tcp.h
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions tls.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions tls.h
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions tlscommon.c
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tlscommon.h
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions tlv11.c
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions tlv11.h
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions udp.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions udp.h
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 2 additions & 2 deletions util.c
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions util.h
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit 9142e68

Please sign in to comment.