Merge fixes from maint-1.8 branch

ChangeLog

@@ -1,23 +1,26 @@
-chanes since 1.8.1
+unreleased chanes
 	New features:
 	- Accept multiple source* configs for IPv4/v6
 	- Specify source per server
 
+	Misc:
+	- Move radsecproxy manpage to section 8
+
+2020-08-06 1.8.2
 	Bug fixes:
 	- Fix wrong config-unhexing if %25 (%) occurs
 	- Fix compatibility with GCC 10 (#63)
 	- Fix spelling in manpage
 	- Fix modifyVendorAttribute not applied (#62)
-
-	Misc:
-	- Move radsecproxy manpage to section 8
+	- Fix unncessary status-server when in minimal mode (#61)
 
 2019-10-01 1.8.1
 	Bug fixes:
 	- Handle Tunnel-Password attribute correctly
 	- Fix BSD platform issues
 	- Fix spelling in log messages and manpages
 	- Fix compile issues for unit tests
+	- Don't hardcode location of config files
 
 2019-07-04 1.8.0
 	New features:

README

@@ -1,4 +1,4 @@
-This is radsecproxy 1.8.0
+This is radsecproxy 1.8.2
 
 radsecproxy is a generic RADIUS proxy that supports both UDP and TLS
 (RadSec) RADIUS transports.  There is also experimental support for

configure.ac

@@ -2,7 +2,7 @@ dnl Copyright (c) 2006-2010, UNINETT AS
 dnl Copyright (c) 2010-2013,2016, NORDUnet A/S
 dnl See LICENSE for licensing information.
 
-AC_INIT(radsecproxy, 1.8.0, https://radsecproxy.github.io)
+AC_INIT(radsecproxy, 1.8.2, https://radsecproxy.github.io)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE

radsecproxy.c

@@ -1649,8 +1649,11 @@ void *clientwr(void *arg) {
 #endif
 	pthread_mutex_unlock(&server->newrq_mutex);
 
-	for (i = 0; i < MAX_REQUESTS; i++) {
-	    if (server->clientrdgone) {
+    if (do_resend || server->lastrcv.tv_sec > laststatsrv.tv_sec)
+        statusserver_requested = 0;
+
+    for (i = 0; i < MAX_REQUESTS; i++) {
+        if (server->clientrdgone) {
 		server->state = RSP_SERVER_STATE_FAILING;
                 if (conf->pdef->connecter)
                     pthread_join(clientrdth, NULL);
@@ -1681,7 +1684,7 @@ void *clientwr(void *arg) {
             continue;
         }
 
-        if (rqout->tries > 0 && now.tv_sec - server->lastrcv.tv_sec > conf->retryinterval)
+        if (rqout->tries > 0 && now.tv_sec - server->lastrcv.tv_sec > conf->retryinterval && !do_resend)
             statusserver_requested = 1;
         if (rqout->tries == (*rqout->rq->buf == RAD_Status_Server ? 1 : conf->retrycount + 1)) {
             debug(DBG_DBG, "clientwr: removing expired packet from queue");

radsecproxy.conf.5.in

@@ -1,4 +1,4 @@
-.TH radsecproxy.conf 5 2019-07-04 "radsecproxy 1.8.0" ""
+.TH radsecproxy.conf 5 2020-08-06 "radsecproxy 1.8.2" ""
 
 .SH NAME
 radsecproxy.conf \- Radsec proxy configuration file