This follows the changes to the upstream radsecproxy repository.
Also, Stig Venaas is removed from all copyright, replaced by UNINETT.
Add JANET as copyright holder (avp.c).
-The libradsec source code is subject to two licenses, you may pick the
-one that best suits your needs.
-
-The libradsec source code is subject to the terms of the GNU General
-Public License Version 2 or later (GPL).
-
-Alternatively the libradsec source code is subject to the terms of the
-below BSD style license.
-
-* Copyright (c) 2006-2010, UNINETT AS
+* Copyright (c) 2007-2010, UNINETT AS
+* Copyright (c) 2011, JANET(UK)
* Copyright (c) 2010-2011, NORDUnet A/S
* All rights reserved.
*
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
-* 3. Neither the name of the UNINETT AS or the NORDUnet A/S, nor the
-* names of the contributors may be used to endorse or promote
-* products derived from this software without specific prior
-* written permission.
+* 3. Neither the name of NORDUnet A/S nor the names of the
+* 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 AND NORDUNET A/S ``AS IS'' AND
+* THIS SOFTWARE IS PROVIDED BY NORDUNET A/S ``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 NORDUNET A/S OR CONTRIBUTORS
-/*
- * Copyright (C) 2007 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) 2007-2009, UNINETT AS
+ * Copyright (c) 2010-2011, NORDUnet A/S */
+/* See COPYING for licensing information. */
#ifndef SYS_SOLARIS9
#include <stdint.h>
-/*
- * Copyright (C) 2007 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) 2007-2009, UNINETT AS
+ * Copyright (c) 2010-2011, NORDUnet A/S */
+/* See COPYING for licensing information. */
#ifndef SYS_SOLARIS9
#include <stdint.h>
-/*
- * 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) 2008, UNINETT AS */
+/* See COPYING for licensing information. */
#include <stdlib.h>
#include <string.h>
-/*
- * 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) 2008, UNINETT AS */
+/* See COPYING for licensing information. */
#ifndef SYS_SOLARIS9
#include <stdint.h>
-/*
- * 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) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
#if defined HAVE_CONFIG_H
#include <config.h>
-/*
- * 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) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
#ifdef SYS_SOLARIS9
#include <sys/inttypes.h>
-/*
- * 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) 2007-2009, UNINETT AS
+ * Copyright (c) 2010-2011, NORDUnet A/S */
+/* See COPYING for licensing information. */
#if defined HAVE_CONFIG_H
#include <config.h>
-/*
- * 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) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
#include <netinet/in.h>
#include <openssl/ssl.h>
-/*
- * 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) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
/* Code contributions from:
*
+/* Copyright (c) 2007-2009, UNINETT AS */
+/* See COPYING for licensing information. */
+
#include <sys/socket.h>
#include <netdb.h>