Merge branch 'libradsec' into libradsec-server-support

Conflicts:
	lib/HACKING
	lib/Makefile.am
	lib/README
	lib/compat.h
	lib/conf.c
	lib/configure.ac
	lib/conn.c
	lib/conn.h
	lib/err.c
	lib/err.h
	lib/event.c
	lib/event.h
	lib/examples/Makefile.am
	lib/examples/client-blocking.c
	lib/examples/client.conf
	lib/include/radsec/radsec-impl.h
	lib/include/radsec/radsec.h
	lib/include/radsec/request-impl.h
	lib/include/radsec/request.h
	lib/packet.c
	lib/packet.h
	lib/peer.c
	lib/peer.h
	lib/request.c
	lib/send.c
	lib/tcp.c
	lib/tests/Makefile.am
	lib/tls.c
	lib/udp.c
	lib/util.c

4 files changed, 19 insertions, 15 deletions

diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h
index 28e9e4c..7da00dd 100644
--- a/lib/include/radsec/radsec-impl.h
+++ b/lib/include/radsec/radsec-impl.h
@@ -1,7 +1,7 @@
 /** @file libradsec-impl.h
     @brief Libraray internal header file for libradsec. */
 
-/* Copyright 2010,2011,2013 NORDUnet A/S. All rights reserved.
+/* Copyright 2010-2013 NORDUnet A/S. All rights reserved.
    See LICENSE for licensing information. */
 
 #ifndef _RADSEC_RADSEC_IMPL_H_
@@ -132,7 +132,6 @@ struct rs_conn_base {
     struct event *rev;		/* Read event (for UDP). */
 };
 
-
 enum rs_conn_state {
     RS_CONN_STATE_UNDEFINED = 0,
     RS_CONN_STATE_CONNECTING,
diff --git a/lib/include/radsec/radsec.h b/lib/include/radsec/radsec.h
index 2858f9e..6b319d3 100644
--- a/lib/include/radsec/radsec.h
+++ b/lib/include/radsec/radsec.h
@@ -1,7 +1,7 @@
 /** \file radsec.h
     \brief Public interface for libradsec. */
 
-/* Copyright 2010,2011,2013 NORDUnet A/S. All rights reserved.
+/* Copyright 2010-2013 NORDUnet A/S. All rights reserved.
    See LICENSE for licensing information. */
 
 #ifndef _RADSEC_RADSEC_H_
@@ -31,7 +31,6 @@ enum rs_error_code {
     RSE_INVALID_CTX = 3,
     RSE_INVALID_CONN = 4,
     RSE_CONN_TYPE_MISMATCH = 5,
-    RSE_FR = 6,
     RSE_BADADDR = 7,
     RSE_NOPEER = 8,
     RSE_EVENT = 9,		/* libevent error.  */
@@ -373,10 +372,19 @@ void rs_message_destroy(struct rs_message *msg);
     \a rs_message_send and it blocks until the message has been
     succesfully sent.
 
+    Note that sending can fail in several ways, f.ex. if the
+    transmission protocol in use is connection oriented
+    (\a RS_CONN_TYPE_TCP and \a RS_CONN_TYPE_TLS) and the connection
+    can not be established.
+
+    Also note that no retransmission is being done. This is required
+    for connectionless transport protocols (\a RS_CONN_TYPE_UDP and
+    \a RS_CONN_TYPE_DTLS). The "request" API with \a rs_request_send can
+    help with this.
+
     \return On success, RSE_OK (0) is returned. On error, !0 is
     returned and a struct \a rs_error is pushed on the error stack for
-    the connection. The error can be accessed using \a
-    rs_err_conn_pop. */
+    the connection. The error can be accessed using \a rs_err_conn_pop. */
 int rs_message_send(struct rs_message *msg);
 
 /** Create a RADIUS authentication request message associated with
diff --git a/lib/include/radsec/request-impl.h b/lib/include/radsec/request-impl.h
index dbb4244..685a666 100644
--- a/lib/include/radsec/request-impl.h
+++ b/lib/include/radsec/request-impl.h
@@ -1,4 +1,4 @@
-/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
+/* Copyright 2010-2011 NORDUnet A/S. All rights reserved.
    See LICENSE for licensing information. */
 
 #ifndef _RADSEC_REQUEST_IMPL_H_
diff --git a/lib/include/radsec/request.h b/lib/include/radsec/request.h
index b78411a..c686de3 100644
--- a/lib/include/radsec/request.h
+++ b/lib/include/radsec/request.h
@@ -1,7 +1,7 @@
 /** \file request.h
     \brief Public interface for libradsec request's.  */
 
-/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
+/* Copyright 2010-2013 NORDUnet A/S. All rights reserved.
    See LICENSE for licensing information. */
 
 #ifndef _RADSEC_REQUEST_H_
@@ -24,16 +24,13 @@ int rs_request_create(struct rs_connection *conn, struct rs_request **req_out);
 void rs_request_add_reqmsg(struct rs_request *req, struct rs_message *req_msg);
 
 /** Create a request associated with connection \a conn containing a
-    newly created RADIUS authentication message, possibly with
-    \a user_name and \a user_pw attributes.  \a user_name and \a user_pw
-    are optional and can be NULL. If \a user_name and \a user_pw are provided,
-    \a secret must also be provided. \a secret is used for "hiding" the
-    password. */
+    newly created RADIUS authentication message, possibly with \a
+    user_name and \a user_pw attributes.  \a user_name and _user_pw
+    are optional and can be NULL.  */
 int rs_request_create_authn(struct rs_connection *conn,
 			    struct rs_request **req_out,
 			    const char *user_name,
-			    const char *user_pw,
-                            const char *secret);
+			    const char *user_pw);
 
 /** Send request \a req and wait for a matching response.  The
     response is put in \a resp_msg (if not NULL).  NOTE: At present,