From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 26 Apr 2018 02:33:35 +0000 (-0400)
Subject: don't over-write server_cs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c6dc23232e8eec2a456ea260e329236e8b6fa42;p=thirdparty%2Ffreeradius-server.git

don't over-write server_cs
---

diff --git a/src/modules/proto_radius/proto_radius.c b/src/modules/proto_radius/proto_radius.c
index d49c0850b8a..c6245050096 100644
--- a/src/modules/proto_radius/proto_radius.c
+++ b/src/modules/proto_radius/proto_radius.c
@@ -470,7 +470,10 @@ static void mod_process_set(void const *instance, REQUEST *request)
 	rad_assert(request->packet->code != 0);
 	rad_assert(request->packet->code <= FR_CODE_MAX);
 
-	request->server_cs = inst->io.server_cs;
+	/*
+	 *	It's already set for the unit tests.
+	 */
+	if (!request->server_cs) request->server_cs = inst->io.server_cs;
 
 	/*
 	 *	'track' can be NULL when there's no network listener.