From: Alexander Clouter <alex@digriz.org.uk>
Date: Mon, 13 Feb 2017 17:10:16 +0000 (+0000)
Subject: fix radrelay
X-Git-Tag: release_3_0_13~34
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=8a8695f60a3ebae54cbe035f3df8553ce61da5e8

fix radrelay
---

diff --git a/raddb/radrelay.conf.in b/raddb/radrelay.conf.in
index 058d148..b10df0c 100644
--- a/raddb/radrelay.conf.in
+++ b/raddb/radrelay.conf.in
@@ -73,13 +73,15 @@ security {
 
 	# reject_delay && status_server don't apply when we are
 	# only reading accounting packets from the detail file
+
+@openssl_version_check_config@
 }
 
 #
 #  If you need more modules, add them here.
 #
 modules {
-	$INCLUDE ${confdir}/modules/always
+	$INCLUDE ${confdir}/mods-enabled/always
 }
 
 #
@@ -128,39 +130,41 @@ home_server_pool radrelay {
 	home_server = home1
 }
 
-#
-#  A dummy realm.
-#
-realm radrelay {
-	acct_pool = radrelay
-}
-
-#
-#  Read the detail file.
-#
-listen {
-	type = detail
+server radrelay {
+	#
+	#  A dummy realm.
+	#
+	realm radrelay {
+		acct_pool = radrelay
+	}
 
 	#
-	#  The filename here should be the same as the one used by the
-	#  main radiusd program.  It writes the file using the "detail"
-	#  module (see raddb/modules/detail).
+	#  Read the detail file.
 	#
-	filename = ${radacctdir}/detail
-	load_factor = 90
-}
+	listen {
+		type = detail
+
+		#
+		#  The filename here should be the same as the one used by the
+		#  main radiusd program.  It writes the file using the "detail"
+		#  module (see raddb/modules/detail).
+		#
+		filename = ${radacctdir}/detail
+		load_factor = 90
+	}
 
-#
-#  See also raddb/sites-available/copy-acct-to-home-server
-#  for additional description.
-#
-preacct {
 	#
-	#  Proxy the packet using the given realm.
-	#  Note that we do not use the realm for anything else such
-	#  as prefix/suffix stripping or comparisons.
+	#  See also raddb/sites-available/copy-acct-to-home-server
+	#  for additional description.
 	#
-	update control {
-		Proxy-To-Realm := "radrelay"
+	preacct {
+		#
+		#  Proxy the packet using the given realm.
+		#  Note that we do not use the realm for anything else such
+		#  as prefix/suffix stripping or comparisons.
+		#
+		update control {
+			Proxy-To-Realm := "radrelay"
+		}
 	}
 }