We no longer need to auto-generate raddb/dictionary

It shouldn't $INCLUDE the main dictionaries any more.

diff --git a/configure b/configure
index 30650f8..0616f39 100755 (executable)
--- a/configure
+++ b/configure
@@ -9472,7 +9472,7 @@ USE_STATIC_LIBS="yes"
   unset ac_cv_env_LIBS_set
   unset ac_cv_env_LIBS_value
 
-  ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/main/radsniff.mk ./src/main/checkrad ./src/main/radlast ./src/main/radtest ./scripts/rc.radiusd ./scripts/cron/radiusd.cron.daily ./scripts/cron/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/dictionary ./raddb/radrelay.conf ./raddb/radiusd.conf"
+  ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/main/radsniff.mk ./src/main/checkrad ./src/main/radlast ./src/main/radtest ./scripts/rc.radiusd ./scripts/cron/radiusd.cron.daily ./scripts/cron/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/radrelay.conf ./raddb/radiusd.conf"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -10184,7 +10184,6 @@ do
     "./scripts/cron/radiusd.cron.daily") CONFIG_FILES="$CONFIG_FILES ./scripts/cron/radiusd.cron.daily" ;;
     "./scripts/cron/radiusd.cron.monthly") CONFIG_FILES="$CONFIG_FILES ./scripts/cron/radiusd.cron.monthly" ;;
     "./scripts/cryptpasswd") CONFIG_FILES="$CONFIG_FILES ./scripts/cryptpasswd" ;;
-    "./raddb/dictionary") CONFIG_FILES="$CONFIG_FILES ./raddb/dictionary" ;;
     "./raddb/radrelay.conf") CONFIG_FILES="$CONFIG_FILES ./raddb/radrelay.conf" ;;
     "./raddb/radiusd.conf") CONFIG_FILES="$CONFIG_FILES ./raddb/radiusd.conf" ;;
 

diff --git a/configure.ac b/configure.ac
index 606530f..fdfc7d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1742,7 +1742,6 @@ AC_OUTPUT(\
   ./scripts/cron/radiusd.cron.daily \
   ./scripts/cron/radiusd.cron.monthly \
   ./scripts/cryptpasswd \
-  ./raddb/dictionary \
   ./raddb/radrelay.conf \
   ./raddb/radiusd.conf
 )

diff --git a/raddb/dictionary.in b/raddb/dictionary
similarity index 84%
rename from raddb/dictionary.in
rename to raddb/dictionary
index ca0064b..69a0d74 100644 (file)
--- a/raddb/dictionary.in
+++ b/raddb/dictionary
@@ -2,8 +2,11 @@
 #      This is the master dictionary file, which references the
 #      pre-defined dictionary files included with the server.
 #
-#      Any new/changed attributes MUST be placed in this file, as
-#      the pre-defined dictionaries SHOULD NOT be edited.
+#      Any new/changed attributes MUST be placed in this file.
+#      The pre-defined dictionaries SHOULD NOT be edited.
+#      As of version 3.0.2, this dictionary does not include
+#      the default dictionaries.  The server now does that
+#      automatically.
 #
 #      See "man dictionary" for documentation on its format.
 #
@@ -11,11 +14,6 @@
 #
 
 #
-#      The filename given here should be an absolute path.
-#
-$INCLUDE       @prefix@/share/freeradius/dictionary
-
-#
 #      All additional attributes an $INCLUDE's should go into
 #      a file "dictionary.local".