From 94d784ece8e847ccae98454b6b203b938ec26fcd Mon Sep 17 00:00:00 2001
From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Date: Jan 19 2015 15:52:26 +0000
Subject: raddb: Move trigger.conf INCLUDE before modules


Move "$INCLUDE trigger.conf" chunk before module section in
"radiusd.conf.in". This makes it possible to reference "snmptrap" and
related trigger variables under "pool.trigger" in module configurations,
simplifying them.

Resolves: Bug#1155961

---

diff --git a/freeradius-raddb-Move-trigger.conf-INCLUDE-before-modules.patch b/freeradius-raddb-Move-trigger.conf-INCLUDE-before-modules.patch
new file mode 100644
index 0000000..994dda0
--- /dev/null
+++ b/freeradius-raddb-Move-trigger.conf-INCLUDE-before-modules.patch
@@ -0,0 +1,62 @@
+From 1b32a0e398871f0f5b7b41d200b1b9db371e84d5 Mon Sep 17 00:00:00 2001
+From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
+Date: Mon, 15 Dec 2014 16:48:26 +0200
+Subject: [PATCH 1/1] raddb: Move trigger.conf INCLUDE before modules
+
+Move "$INCLUDE trigger.conf" chunk before module section in
+"radiusd.conf.in". This makes it possible to reference "snmptrap" and
+related trigger variables under "pool.trigger" in module configurations,
+simplifying them.
+
+E.g. like this (in raddb/mods-enabled/ldap):
+
+ldap ldap_instance {
+    pool {
+        trigger {
+            args = "radiusdModuleName s '${...:name}' radiusdModuleInstance s '${...:instance}'"
+            open = "${snmptrap}::serverModuleConnectionUp ${args}"
+            close = "${snmptrap}::serverModuleConnectionDown ${args}"
+        }
+    }
+}
+---
+ raddb/radiusd.conf.in | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
+index c6d5834..fb7d1bd 100644
+--- a/raddb/radiusd.conf.in
++++ b/raddb/radiusd.conf.in
+@@ -648,6 +648,14 @@ thread pool {
+ 	auto_limit_acct = no
+ }
+ 
++######################################################################
++#
++#  SNMP notifications.  Uncomment the following line to enable
++#  snmptraps.  Note that you MUST also configure the full path
++#  to the "snmptrap" command in the "trigger.conf" file.
++#
++#$INCLUDE trigger.conf
++
+ # MODULE CONFIGURATION
+ #
+ #  The names and configuration of each module is located in this section.
+@@ -780,14 +788,6 @@ policy {
+ 
+ ######################################################################
+ #
+-#  SNMP notifications.  Uncomment the following line to enable
+-#  snmptraps.  Note that you MUST also configure the full path
+-#  to the "snmptrap" command in the "trigger.conf" file.
+-#
+-#$INCLUDE trigger.conf
+-
+-######################################################################
+-#
+ #	Load virtual servers.
+ #
+ #	This next $INCLUDE line loads files in the directory that
+-- 
+2.1.3
+
diff --git a/freeradius.spec b/freeradius.spec
index 9c23844..6c08eca 100644
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -48,6 +48,7 @@ Patch24: freeradius-valuepair-don-t-remove-unkown-backslash.patch
 Patch25: freeradius-rad_counter-use-heredoc-for-help-message.patch
 Patch26: freeradius-rad_counter-Refine-help-message.patch
 Patch27: freeradius-dhcpclient-Add-a-short-description-to-help-output.patch
+Patch28: freeradius-raddb-Move-trigger.conf-INCLUDE-before-modules.patch
 
 %global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
 
@@ -231,6 +232,7 @@ This plugin provides the unixODBC support for the FreeRADIUS server project.
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 %build
 # Force compile/link options, extra security for network facing daemon