From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 2 Sep 2023 12:44:00 +0000 (-0400)
Subject: allow for per-module dictionaries
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6723f4e5e1dab2676e5b0308b4679309530caa1f;p=thirdparty%2Ffreeradius-server.git

allow for per-module dictionaries
---

diff --git a/share/dictionary/freeradius/dictionary b/share/dictionary/freeradius/dictionary
index 7688ff931f8..f842dd35885 100644
--- a/share/dictionary/freeradius/dictionary
+++ b/share/dictionary/freeradius/dictionary
@@ -21,3 +21,8 @@ $INCLUDE dictionary.freeradius.internal.ippool
 
 # 5200-5299 SIM management attributes
 $INCLUDE dictionary.freeradius.internal.sim
+
+#
+#  Include module-specific dictionaries.
+#
+$INCLUDE- modules/*.txt
diff --git a/src/modules/all.mk b/src/modules/all.mk
index e2637887fc3..1f97784f78f 100644
--- a/src/modules/all.mk
+++ b/src/modules/all.mk
@@ -33,3 +33,17 @@ src/modules/%/configure: src/modules/%/configure.ac $(wildcard ${top_srcdir}/m4/
 		$(ACLOCAL) -I $(top_builddir)/m4 && \
 		$(AUTOCONF)
 endif
+
+#
+#  This dictionary file loads all of the module-specific ones.
+#
+share/dictionary/freeradius/dictionary: $(patsubst src/modules/rlm_%/dictionary,share/dictionary/freeradius/modules/%.txt,$(wildcard src/modules/rlm_*/dictionary))
+	@touch $@
+
+#
+#  In the modules they're called "dictionary".  In the installed directory, they're just text files.
+#
+#  No one should be editing them.
+#
+share/dictionary/freeradius/modules/%.txt: src/modules/rlm_%/dictionary
+	@cp $< $@