Update docs and suse/rhel specs for attrs

diff --git a/man/man5/rlm_attr_filter.5 b/man/man5/rlm_attr_filter.5
index 7845c6cce498050b0c059b877215bbfb63ecaaa6..3cb885ffbc4ed648a9b69de1791d9d050e5bf70c 100644 (file)
--- a/man/man5/rlm_attr_filter.5
+++ b/man/man5/rlm_attr_filter.5
@@ -102,7 +102,7 @@ sample rule ordering and how to use the different operators.
 .DE
 .PP
 The configuration items are:
-.IP attrsfile
+.IP file
 This specifies the location of the file used to load the filter rules.
 This file is used to filter the accounting response, packet before it
 is proxied, proxy response from the home server, or our response to
@@ -135,7 +135,7 @@ Filters Access-Accept or Access-Reject packets.
 .PP
 .SH FILES
 .I /etc/raddb/radiusd.conf
-.I /etc/raddb/attrs
+.I /etc/raddb/filter/*
 .PP
 .SH "SEE ALSO"
 .BR radiusd (8),

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index d1ff144d4a03651281ccac9f93f152455000566c..7b6f1c289becc1a167a613109def64854fb6541e 100644 (file)
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -279,13 +279,9 @@ fi
 # configs
 %dir %attr(755,root,radiusd) /etc/raddb
 %defattr(-,root,radiusd)
+%attr(640,root,radiusd) %config(noreplace) /etc/raddb/filter/*
 %attr(644,root,radiusd) %config(noreplace) /etc/raddb/dictionary
 %config(noreplace) /etc/raddb/acct_users
-%config(noreplace) /etc/raddb/attrs
-%config(noreplace) /etc/raddb/attrs.access_challenge
-%config(noreplace) /etc/raddb/attrs.access_reject
-%config(noreplace) /etc/raddb/attrs.accounting_response
-%config(noreplace) /etc/raddb/attrs.pre-proxy
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/clients.conf
 %config(noreplace) /etc/raddb/hints
 %config(noreplace) /etc/raddb/huntgroups

diff --git a/suse/freeradius.spec b/suse/freeradius.spec
index 3499bbf6c7d1de4275bf0e02955b1375dd35c3c9..6200f3cc7ba4f80211b405fee48e74d81d4c2662 100644 (file)
--- a/suse/freeradius.spec
+++ b/suse/freeradius.spec
@@ -307,14 +307,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(755,radiusd,radiusd) /var/lib/radiusd
 # configs
 %dir %attr(750,-,radiusd) %{_sysconfdir}/raddb
+%attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/filter/*
 %defattr(-,root,radiusd)
 %config(noreplace) %{_sysconfdir}/raddb/dictionary
 %config(noreplace) %{_sysconfdir}/raddb/acct_users
-%config(noreplace) %{_sysconfdir}/raddb/attrs
-%config(noreplace) %{_sysconfdir}/raddb/attrs.access_reject
-%config(noreplace) %{_sysconfdir}/raddb/attrs.access_challenge
-%config(noreplace) %{_sysconfdir}/raddb/attrs.accounting_response
-%config(noreplace) %{_sysconfdir}/raddb/attrs.pre-proxy
 %attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/clients.conf
 %config(noreplace) %{_sysconfdir}/raddb/hints
 %config(noreplace) %{_sysconfdir}/raddb/huntgroups