From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 5 Dec 2012 13:49:58 +0000 (+0000)
Subject: Die attrmap die
X-Git-Tag: release_3_0_0_beta1~1424
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ea43b848f8a57199f93fdf691d395e02b6fc04d;p=thirdparty%2Ffreeradius-server.git

Die attrmap die
---

diff --git a/debian/freeradius.install b/debian/freeradius.install
index df66779c97a..aba570ea292 100644
--- a/debian/freeradius.install
+++ b/debian/freeradius.install
@@ -8,7 +8,6 @@ etc/freeradius/clients.conf
 etc/freeradius/experimental.conf
 etc/freeradius/hints
 etc/freeradius/huntgroups
-etc/freeradius/ldap.attrmap
 etc/freeradius/mods-available/*
 etc/freeradius/mods-enabled/*
 etc/freeradius/policy.d/*
diff --git a/debian/freeradius.postinst b/debian/freeradius.postinst
index bb8b3d327a0..c878136f742 100755
--- a/debian/freeradius.postinst
+++ b/debian/freeradius.postinst
@@ -30,7 +30,6 @@ case "$1" in
             /etc/freeradius/proxy.conf \
             /etc/freeradius/attrs.pre-proxy \
             /etc/freeradius/hints \
-            /etc/freeradius/ldap.attrmap \
             /etc/freeradius/attrs \
             /etc/freeradius/policy.txt \
             /etc/freeradius/attrs.accounting_response \
diff --git a/debian/freeradius.prerm b/debian/freeradius.prerm
index 201e1424107..a34c6deea8a 100755
--- a/debian/freeradius.prerm
+++ b/debian/freeradius.prerm
@@ -16,7 +16,6 @@ case "$1" in
           /etc/freeradius/proxy.conf \
           /etc/freeradius/attrs.pre-proxy \
           /etc/freeradius/hints \
-          /etc/freeradius/ldap.attrmap \
           /etc/freeradius/attrs \
           /etc/freeradius/policy.txt \
           /etc/freeradius/attrs.accounting_response \
diff --git a/raddb/Makefile b/raddb/Makefile
index a2d5eba28ba..169a92bf9b6 100644
--- a/raddb/Makefile
+++ b/raddb/Makefile
@@ -11,7 +11,7 @@ include ../Make.inc
 #
 FILES = acct_users attrs attrs.access_reject attrs.accounting_response	\
 	attrs.pre-proxy clients.conf dictionary templates.conf	\
-	experimental.conf hints huntgroups ldap.attrmap			\
+	experimental.conf hints huntgroups \
 	policy.txt preproxy_users proxy.conf radiusd.conf trigger.conf	\
 	users attrs.access_challenge README.rst
 
diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 3f4e8369f98..d1ff144d4a0 100644
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -507,7 +507,6 @@ fi
 
 %files ldap
 %defattr(-,root,root)
-%attr(640,root,radiusd) %config(noreplace) /etc/raddb/ldap.attrmap
 %{_libdir}/freeradius/rlm_ldap.so
 %{_libdir}/freeradius/rlm_ldap-%{version}.so
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/modules/ldap
diff --git a/suse/freeradius.spec b/suse/freeradius.spec
index 5154ca3ae89..3499bbf6c7d 100644
--- a/suse/freeradius.spec
+++ b/suse/freeradius.spec
@@ -318,7 +318,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/clients.conf
 %config(noreplace) %{_sysconfdir}/raddb/hints
 %config(noreplace) %{_sysconfdir}/raddb/huntgroups
-%config(noreplace) %{_sysconfdir}/raddb/ldap.attrmap
 %attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/sqlippool.conf
 %attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/preproxy_users
 %attr(640,-,radiusd) %config(noreplace) %{_sysconfdir}/raddb/proxy.conf