Need to check if the max_uses/lifetime/idle_timeout values > 0 (enabled) before enfor...

diff --git a/src/main/connection.c b/src/main/connection.c
index 020ca5ed7b05c24636af8f5ff072c7e3bdb4539f..b226dced7c5f73e1120d56d935e9fb27c77924e9 100644 (file)
--- a/src/main/connection.c
+++ b/src/main/connection.c
@@ -285,16 +285,18 @@ static int fr_connection_manage(fr_connection_pool_t *fc,
        rad_assert(fc != NULL);
        rad_assert(this != NULL);
 
-       if (this->num_uses >= fc->max_uses) {
+       if ((fc->max_uses > 0) && (this->num_uses >= fc->max_uses)) {
        do_delete:
                fr_connection_close(fc, this);
                pthread_mutex_unlock(&fc->mutex);
                return 0;
        }
 
-       if ((this->start + fc->lifetime) < now) goto do_delete;
+       if ((fc->lifetime > 0) && ((this->start + fc->lifetime) < now))
+               goto do_delete;
 
-       if ((this->last_used + fc->idle_timeout) < now) goto do_delete;
+       if ((fc->idle_timeout > 0) && ((this->last_used + fc->idle_timeout) < now))
+               goto do_delete;
 
        return 1;
 }