Merge tag 'release_3_0_10' into tr-integ

Conflicts:
	raddb/mods-config/attr_filter/access_reject
	src/main/tls.c
	src/main/tls_listen.c
	src/modules/rlm_realm/rlm_realm.c
	src/modules/rlm_realm/trustrouter.c

diff --cc raddb/mods-config/attr_filter/access_reject
index 50414d0,afd8947..1ff7ac5
--- 1/raddb/mods-config/attr_filter/access_reject
--- 2/raddb/mods-config/attr_filter/access_reject
+++ b/raddb/mods-config/attr_filter/access_reject
@@@ -16,4 -16,5 +16,6 @@@ DEFAUL
        Reply-Message =* ANY,
        MS-CHAP-Error =* ANY,
        Proxy-State =* ANY,
-       Error-Cause =* ANY
+       FreeRADIUS-Response-Delay =* ANY,
+       FreeRADIUS-Response-Delay-USec =* ANY
++

diff --cc src/main/tls.c
index 5fce780,1e1e4f5..d86391f
--- 1/src/main/tls.c
--- 2/src/main/tls.c
+++ b/src/main/tls.c
@@@ -283,10 -313,22 +313,21 @@@ tls_session_t *tls_new_client_session(T
        return ssn;
  }
  
 -
+ /** Create a new TLS session
+  *
+  * Configures a new TLS session, configuring options, setting callbacks etc...
+  *
+  * @param ctx to alloc session data in. Should usually be NULL unless the lifetime of the
+  *    session is tied to another talloc'd object.
+  * @param conf to use to configure the tls session.
+  * @param request The current #REQUEST.
+  * @param client_cert Whether to require a client_cert.
+  * @return a new session on success, or NULL on error.
+  */
  tls_session_t *tls_new_session(TALLOC_CTX *ctx, fr_tls_server_conf_t *conf, REQUEST *request, bool client_cert)
  {
-       tls_session_t *state = NULL;
-       SSL *new_tls = NULL;
+       tls_session_t   *state = NULL;
+       SSL             *new_tls = NULL;
        int             verify_mode = 0;
        VALUE_PAIR      *vp;
  

diff --cc src/main/tls_listen.c
Simple merge

diff --cc src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index 869eb73,b442abb..f0168b1
--- 1/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
--- 2/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@@ -403,23 -536,19 +536,21 @@@ static sql_rcode_t sql_socket_init(rlm_
        INFO("rlm_sql_sqlite: Opening SQLite database \"%s\"", driver->filename);
  #ifdef HAVE_SQLITE3_OPEN_V2
        status = sqlite3_open_v2(driver->filename, &(conn->db), SQLITE_OPEN_READWRITE | SQLITE_OPEN_NOMUTEX, NULL);
 +      sqlite3_busy_timeout( conn->db, 200); /*wait up to 200 ms for db locks*/
  #else
 +      
        status = sqlite3_open(driver->filename, &(conn->db));
  #endif
-       if (!conn->db) {
- #ifdef HAVE_SQLITE3_ERRSTR
-               ERROR("rlm_sql_sqlite: Failed creating opening/creating SQLite: %s", sqlite3_errstr(status));
- #else
-               ERROR("rlm_sql_sqlite: Failed creating opening/creating SQLite database error code (%i)",
-                     status);
- #endif
  
+       if (!conn->db || (sql_check_error(conn->db, status) != RLM_SQL_OK)) {
+               sql_print_error(conn->db, status, "Error opening SQLite database \"%s\"", driver->filename);
+               return RLM_SQL_ERROR;
+       }
+       status = sqlite3_busy_timeout(conn->db, driver->busy_timeout);
+       if (sql_check_error(conn->db, status) != RLM_SQL_OK) {
+               sql_print_error(conn->db, status, "Error setting busy timeout");
                return RLM_SQL_ERROR;
        }
- 
-       if (sql_check_error(conn->db) != RLM_SQL_OK) return RLM_SQL_ERROR;
  
        /*
         *      Enable extended return codes for extra debugging info.