From: Luke Howard <lukeh@padl.com>
Date: Sat, 12 Mar 2011 03:50:46 +0000 (+1100)
Subject: HEADS UP: move dictionary file to $prefix/etc/raddb/dictionary
X-Git-Tag: dvd/201105~12^2~125
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain;h=d79555721279e311939f2f80073c024455d5e7fe

HEADS UP: move dictionary file to $prefix/etc/raddb/dictionary
instead of $prefix/share/freeradius/dictionary on advice from
Alan DeKok
---

diff --git a/README b/README
index 4a0dbf9..7b4d867 100644
--- a/README
+++ b/README
@@ -39,12 +39,14 @@ These instructions apply to FreeRADIUS only, which is downloadable
 from http://freeradius.org/. After configure, make, install, do the
 following:
 
-On the RADIUS server side, you need to install dictionary.ukerna and
-include it from the main dictionary file. Do this by adding:
+On the RADIUS server side, you need to install dictionary.ukerna to
+$prefix/etc/raddb and include it from the main dictionary file, by
+adding:
 
     $INCLUDE dictionary.ukerna
 
-to $prefix/share/freeradius/dictionary.
+to $prefix/etc/raddb/dictionary. Make sure these files are world-
+readable; they weren't in my installation.
 
 Edit $prefix/etc/raddb/users to add your test user and password:
 
diff --git a/util_radius.h b/util_radius.h
index cc54f9d..eaec68e 100644
--- a/util_radius.h
+++ b/util_radius.h
@@ -149,7 +149,7 @@ gssEapRadiusMapError(OM_uint32 *minor,
                      struct rs_error *err);
 
 #define RS_CONFIG_FILE      SYSCONFDIR "/radsec.conf"
-#define RS_DICT_FILE        DATAROOTDIR "/freeradius/dictionary"
+#define RS_DICT_FILE        SYSCONFDIR "/raddb/dictionary"
 
 #define VENDORPEC_MS                        311 /* RFC 2548 */