Merge branch 'licensing-nogpl'

Conflicts:
	configure.ac

diff --combined configure.ac
index 9ba93f5,4326ecc..e5df020
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,8 +1,8 @@@
 -AC_INIT(radsecproxy, 1.6.1-dev, radsecproxy@uninett.no)
+ 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
  AC_PROG_CC

diff --combined dtls.c
index 3772113,9e769fc..fdc99ab
--- 1/dtls.c
--- 2/dtls.c
+++ b/dtls.c
@@@ -1,10 -1,6 +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>
@@@ -354,7 -350,6 +350,7 @@@ void *dtlsservernew(void *arg) 
      X509 *cert = NULL;
      SSL_CTX *ctx = NULL;
      uint8_t delay = 60;
 +    struct tls *accepted_tls = NULL;
  
      debug(DBG_DBG, "dtlsservernew: starting");
      conf = find_clconf(handle, (struct sockaddr *)&params->addr, NULL);
@@@ -368,11 -363,10 +364,11 @@@
        cert = verifytlscert(ssl);
          if (!cert)
              goto exit;
 +        accepted_tls = conf->tlsconf;
      }
  
      while (conf) {
 -      if (verifyconfcert(cert, conf)) {
 +      if (accepted_tls == conf->tlsconf && verifyconfcert(cert, conf)) {
            X509_free(cert);
            client = addclient(conf, 1);
            if (client) {