From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 23 Aug 2017 13:04:44 +0000 (-0400)
Subject: stupid compilers
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a96ff4e99bd02eab9050b147f3930d50ba1a59a;p=thirdparty%2Ffreeradius-server.git

stupid compilers
---

diff --git a/src/modules/rlm_radius/TODO.md b/src/modules/rlm_radius/TODO.md
index affc5da41bc..dafd261b14d 100644
--- a/src/modules/rlm_radius/TODO.md
+++ b/src/modules/rlm_radius/TODO.md
@@ -156,3 +156,17 @@ just retransmit on a new connection.
 packet types.  We then need to require config for username / password,
 for Access-Request, and just username for Accounting-Request.
 
+* fix fork
+
+    fork server.packet-type {
+        &foo += &parent:bar
+    }
+
+* fork is an 'update' section that also runs a new virtual server.  A
+  little weird, but it should work.
+
+* needs helper functions in virtual_server.c to do it.. and to create
+  child REQUEST async stuff with listen, protocol handler, etc.
+
+* fork also needs to do this sanity check on compile, so that it knows
+  it can dereference things which exist...
\ No newline at end of file
diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 911ad459649..21f3ae049e0 100644
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -951,7 +951,7 @@ static void response_timeout(UNUSED fr_event_list_t *el, struct timeval *now, vo
 	       fr_packet_codes[u->code], u->rr->id, u->packet_len, c->name);
 	rdebug_pair_list(L_DBG_LVL_2, request, request->packet->vps, NULL);
 	if (u->extra) rdebug_pair_list(L_DBG_LVL_2, request, u->extra, NULL);
-	if (u->manual_delay_time) {
+	if (u->manual_delay_time && m->acct_delay_time) {
 		uint32_t delay;
 
 		memcpy(&delay, u->acct_delay_time, 4);