allow for per-module dictionaries

diff --git a/share/dictionary/freeradius/dictionary b/share/dictionary/freeradius/dictionary
index 7688ff931f8acb608b6c084f9ec6b608cd5ed13e..f842dd3588571eb1d2467ad216c1e7b0973066db 100644 (file)
--- 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 e2637887fc3c01d2a748cdf89cd63b4a69c5797b..1f97784f78f64413c159656f26a51c4ba2b143f9 100644 (file)
--- 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 $< $@