Add the DHCP dictionary by default

diff --git a/raddb/dictionary.in b/raddb/dictionary.in
index 9e251f07a387f96c70df9071989e6db9774ce714..ceb31c82feb869972588f60fe6ace2fc1db70224 100644 (file)
--- a/raddb/dictionary.in
+++ b/raddb/dictionary.in
@@ -8,18 +8,6 @@
 #      $Id$
 #
 
-#
-#  The DHCP dictionary is used only when the server is built with
-#  "configure --with-dhcp".  It is not (and should not) be used in
-#  other situations.  If you are running just a RADIUS server, this
-#  line can be deleted.  If you are using DHCP, the following line
-#  should be uncommented.
-#
-#  Ideally, the "configure" process should automatically enable this
-#  dictionary, but we don't yet do that.
-#
-#$INCLUDE      @prefix@/share/freeradius/dictionary.dhcp
-
 #
 #      The filename given here should be an absolute path. 
 #

diff --git a/share/dictionary b/share/dictionary
index a633aeb4cb9e5f080547cbdfcf62f97dedab9fb0..8c58347dacb3cb4a4a1fc97c21ef3700dcad65eb 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -123,6 +123,7 @@ $INCLUDE dictionary.cisco.bbsm
 $INCLUDE dictionary.clavister
 $INCLUDE dictionary.colubris
 $INCLUDE dictionary.cosine
+$INCLUDE dictionary.dhcp
 $INCLUDE dictionary.digium
 $INCLUDE dictionary.eltex
 $INCLUDE dictionary.epygi