Merge branch 'v3.0.x' into patch-3

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index 390bd57..d1417c5 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -744,15 +744,18 @@ VALUE     EAP-Type                        Notification            2
 VALUE  EAP-Type                        NAK                     3
 VALUE  EAP-Type                        MD5-Challenge           4
 VALUE  EAP-Type                        MD5                     4
+VALUE  EAP-Type                        EAP-MD5                 4
 VALUE  EAP-Type                        One-Time-Password       5
 VALUE  EAP-Type                        OTP                     5
 VALUE  EAP-Type                        Generic-Token-Card      6
 VALUE  EAP-Type                        GTC                     6
+VALUE  EAP-Type                        EAP-GTC                 6
 VALUE  EAP-Type                        RSA-Public-Key          9
 VALUE  EAP-Type                        DSS-Unilateral          10
 VALUE  EAP-Type                        KEA                     11
 VALUE  EAP-Type                        KEA-Validate            12
 VALUE  EAP-Type                        TLS                     13
+VALUE  EAP-Type                        EAP-TLS                 13
 VALUE  EAP-Type                        Defender-Token          14
 VALUE  EAP-Type                        RSA-SecurID-EAP         15
 VALUE  EAP-Type                        Arcot-Systems-EAP       16
@@ -760,11 +763,14 @@ VALUE     EAP-Type                        Cisco-LEAP              17
 VALUE  EAP-Type                        LEAP                    17
 VALUE  EAP-Type                        Nokia-IP-Smart-Card     18
 VALUE  EAP-Type                        SIM                     18
+VALUE  EAP-Type                        EAP-SIM                 18
 VALUE  EAP-Type                        SRP-SHA1                19
 # 20 is unassigned
 VALUE  EAP-Type                        TTLS                    21
+VALUE  EAP-Type                        EAP-TTLS                21
 VALUE  EAP-Type                        Remote-Access-Service   22
 VALUE  EAP-Type                        AKA                     23
+VALUE  EAP-Type                        EAP-AKA                 23
 VALUE  EAP-Type                        3Com-Wireless           24
 VALUE  EAP-Type                        PEAP                    25
 VALUE  EAP-Type                        Microsoft-MS-CHAPv2     26
@@ -801,6 +807,7 @@ VALUE       EAP-Type                        EKEv1                   53
 #      And this is what most people mean by MS-CHAPv2
 #
 VALUE  EAP-Type                        MSCHAPv2                26
+VALUE  EAP-Type                        EAP-MSCHAPv2            26
 
 #
 #      This says TLS, but it's only valid for TTLS & PEAP.

diff --git a/src/include/tls-h b/src/include/tls-h
index 520553b..095ef1f 100644 (file)
--- a/src/include/tls-h
+++ b/src/include/tls-h
@@ -308,6 +308,7 @@ tls_session_t       *tls_new_session(TALLOC_CTX *ctx, fr_tls_server_conf_t *conf, REQU
 tls_session_t  *tls_new_client_session(TALLOC_CTX *ctx, fr_tls_server_conf_t *conf, int fd);
 fr_tls_server_conf_t *tls_server_conf_parse(CONF_SECTION *cs);
 fr_tls_server_conf_t *tls_client_conf_parse(CONF_SECTION *cs);
+fr_tls_server_conf_t *tls_server_conf_alloc(TALLOC_CTX *ctx);
 SSL_CTX                *tls_init_ctx(fr_tls_server_conf_t *conf, int client);
 int            tls_handshake_recv(REQUEST *, tls_session_t *ssn);
 int            tls_handshake_send(REQUEST *, tls_session_t *ssn);

diff --git a/src/main/realms.c b/src/main/realms.c
index 2a047e0..d1fafcf 100644 (file)
--- a/src/main/realms.c
+++ b/src/main/realms.c
@@ -1156,7 +1156,7 @@ void realm_pool_free(home_pool_t *pool)
        }
 
        this->next = NULL;
-       this->when = now + 60;
+       this->when = now + 300;
        this->pool = pool;
        pthread_mutex_unlock(&pool_free_mutex);
 }

diff --git a/src/main/tls.c b/src/main/tls.c
index 845d3bc..c676882 100644 (file)
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -3104,7 +3104,7 @@ static int _tls_server_conf_free(fr_tls_server_conf_t *conf)
        return 0;
 }
 
-static fr_tls_server_conf_t *tls_server_conf_alloc(TALLOC_CTX *ctx)
+fr_tls_server_conf_t *tls_server_conf_alloc(TALLOC_CTX *ctx)
 {
        fr_tls_server_conf_t *conf;
 

diff --git a/src/modules/rlm_realm/trustrouter.c b/src/modules/rlm_realm/trustrouter.c
index 1636a4b..c3a4d9c 100644 (file)
--- a/src/modules/rlm_realm/trustrouter.c
+++ b/src/modules/rlm_realm/trustrouter.c
@@ -70,7 +70,7 @@ static fr_tls_server_conf_t *construct_tls(TIDC_INSTANCE *inst,
        char *hexbuf = NULL;
        DH *aaa_server_dh;
 
-       tls = talloc_zero( hs, fr_tls_server_conf_t);
+       tls = fr_tls_server_conf_alloc(hs);
        if (!tls) return NULL;
 
        aaa_server_dh = tid_srvr_get_dh(server);
@@ -181,7 +181,12 @@ static home_server_t *srvr_blk_to_home_server(TALLOC_CTX *ctx,
        hs->secret = talloc_strdup(hs, "radsec");
        hs->response_window.tv_sec = 30;
        hs->last_packet_recv = time(NULL);
-
+       /* 
+        *  We want sockets using these servers to close as soon as possible, 
+        *  to make sure that whenever a pool is replaced, sockets using old ones 
+        *  will not last long (hopefully less than 300s).
+        */
+       hs->limit.idle_timeout = 5;
        hs->tls = construct_tls(inst, hs, blk);
        if (!hs->tls) goto error;
 
@@ -321,14 +326,6 @@ static bool update_required(REALM const *r)
                }
 
                /*
-                *      This server has received a packet in the last
-                *      5 minutes.  It doesn't need an update.
-                */
-               if ((now - server->last_packet_recv) < 300) {
-                       return false;
-               }
-
-               /*
                 *      If we've opened in the last 10 minutes, then
                 *      open rather than update.
                 */

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
index 4a4ae5c..c15664c 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
@@ -259,6 +259,7 @@ static sql_rcode_t sql_free_result(rlm_sql_handle_t *handle, rlm_sql_config_t *c
        conn->row = NULL;
 
        SQLFreeStmt(conn->stmt, SQL_DROP);
+       conn->stmt = NULL;
 
        return 0;
 }