Merge branch 'moonshot' into debian

Conflicts:
	lib/Makefile.am
	lib/build-aux/config.guess
	lib/build-aux/config.sub
	lib/build-aux/depcomp
	lib/build-aux/ltmain.sh
	lib/build-aux/missing
	lib/m4/libtool.m4
	lib/m4/ltoptions.m4
	lib/m4/ltversion.m4
	lib/m4/lt~obsolete.m4
	lib/radsec.c
	lib/radsecproxy/tlscommon.c
	lib/tls.c

diff --cc lib/Makefile.am
index 44f9f02,2184994..d5b2bff
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -1,12 -1,27 +1,26 @@@
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I m4
  
- SUBDIRS = radius include . examples
- DIST_SUBDIRS=tests ${SUBDIRS}
+ # Shared library interface version, i.e. -version-info to Libtool,
+ # expressed as three integers CURRENT:REVISION:AGE.
+ #
+ # CURRENT is the version number of the current interface. Increment
+ # CURRENT when the library interface has changed or has been extended.
+ #
+ # REVISION is the version number of the _implementation_ of the
+ # CURRENT interface. Set REVISION to 0 when CURRENT changes, else
+ # increment.
+ #
+ # AGE is the number of interfaces this library implements, i.e. how
+ # many versions before CURRENT that are supported. Increment AGE when
+ # the library interface is _extended_. Set AGE to 0 when the library
+ # interface is _changed_.
  
- INCLUDES = -I$(srcdir)/include -I$(srcdir)/radsecproxy-includes
 -
+ SUBDIRS = radius radsecproxy include . examples
+ DIST_SUBDIRS = $(SUBDIRS) tests
  
- AM_CFLAGS = -Wall -g
+ INCLUDES = -I$(srcdir)/include
+ AM_CFLAGS = -Wall -Werror -g
  
  lib_LTLIBRARIES = libradsec.la
  

diff --cc lib/radsecproxy-includes/dtls.h
index 3426e63,3426e63..0000000
deleted file mode 100644,100644
--- 1/lib/radsecproxy-includes/dtls.h
--- 2/lib/radsecproxy-includes/dtls.h
+++ /dev/null
@@@ -1,13 -1,13 +1,0 @@@
--/*
-- * 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.
-- */
--
--const struct protodefs *dtlsinit(uint8_t h);
--
--/* Local Variables: */
--/* c-file-style: "stroustrup" */
--/* End: */

diff --cc lib/radsecproxy-includes/hostport.h
index 01237e2,01237e2..0000000
deleted file mode 100644,100644
--- 1/lib/radsecproxy-includes/hostport.h
--- 2/lib/radsecproxy-includes/hostport.h
+++ /dev/null
@@@ -1,23 -1,23 +1,0 @@@
--/*
-- * 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.
-- */
--
--#include "hostport_types.h"
--
--struct hostportres *newhostport(char *hostport, char *default_port, uint8_t prefixok);
--int addhostport(struct list **hostports, char **hostport, char *portdefault, uint8_t prefixok);
--void freehostport(struct hostportres *hp);
--void freehostports(struct list *hostports);
--int resolvehostport(struct hostportres *hp, int socktype, uint8_t passive);
--int resolvehostports(struct list *hostports, int socktype);
--struct addrinfo *resolvepassiveaddrinfo(char *hostport, char *default_port, int socktype);
--int addressmatches(struct list *hostports, struct sockaddr *addr, uint8_t checkport);
--int connecttcphostlist(struct list *hostports,  struct addrinfo *src);
--
--/* Local Variables: */
--/* c-file-style: "stroustrup" */
--/* End: */

diff --cc lib/radsecproxy-includes/tcp.h
index c388895,c388895..0000000
deleted file mode 100644,100644
--- 1/lib/radsecproxy-includes/tcp.h
--- 2/lib/radsecproxy-includes/tcp.h
+++ /dev/null
@@@ -1,13 -1,13 +1,0 @@@
--/*
-- * 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.
-- */
--
--const struct protodefs *tcpinit(uint8_t h);
--
--/* Local Variables: */
--/* c-file-style: "stroustrup" */
--/* End: */

diff --cc lib/radsecproxy-includes/tls.h
index 1a8735e,1a8735e..0000000
deleted file mode 100644,100644
--- 1/lib/radsecproxy-includes/tls.h
--- 2/lib/radsecproxy-includes/tls.h
+++ /dev/null
@@@ -1,13 -1,13 +1,0 @@@
--/*
-- * 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.
-- */
--
--const struct protodefs *tlsinit(uint8_t h);
--
--/* Local Variables: */
--/* c-file-style: "stroustrup" */
--/* End: */

diff --cc lib/radsecproxy-includes/udp.h
index 8f26e15,8f26e15..0000000
deleted file mode 100644,100644
--- 1/lib/radsecproxy-includes/udp.h
--- 2/lib/radsecproxy-includes/udp.h
+++ /dev/null
@@@ -1,13 -1,13 +1,0 @@@
--/*
-- * 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.
-- */
--
--const struct protodefs *udpinit(uint8_t h);
--
--/* Local Variables: */
--/* c-file-style: "stroustrup" */
--/* End: */

diff --cc lib/tls.c
index 5dd8860,62e219e..f7d4256
--- 1/lib/tls.c
--- 2/lib/tls.c
+++ b/lib/tls.c
@@@ -12,8 -15,8 +15,13 @@@
  #include <radsec/radsec-impl.h>
  
  #include <regex.h>
++<<<<<<< HEAD
 +#include "rsp_list.h"
 +#include "radsecproxy.h"
++=======
+ #include "radsecproxy/list.h"
+ #include "radsecproxy/radsecproxy.h"
++>>>>>>> moonshot
  
  static struct tls *
  _get_tlsconf (struct rs_connection *conn, const struct rs_realm *realm)