From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 30 Jan 2012 17:06:27 +0000 (+0100)
Subject: Add the DHCP dictionary by default
X-Git-Tag: release_2_2_0~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2ea135fcf502ec2b9cc2e76795435023c897631;p=thirdparty%2Ffreeradius-server.git

Add the DHCP dictionary by default
---

diff --git a/raddb/dictionary.in b/raddb/dictionary.in
index 9e251f07a38..ceb31c82feb 100644
--- 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 a633aeb4cb9..8c58347dacb 100644
--- 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