OK, datadir is now ${prefix}/share, which is what it's supposed

	to be.

	Added a new 'dictdir' variable, to tell us where the dictionaries
	are located.  It's defined as ${datadir}/freeradius

diff --git a/Make.inc.in b/Make.inc.in
index 876f98e..c96d96f 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -13,7 +13,8 @@ libdir                = @libdir@
 bindir         = @bindir@
 sbindir                = @sbindir@
 mandir         = @mandir@
-datadir                = @datadir@/freeradius
+datadir                = @datadir@
+dictdir                = $(datadir)/freeradius
 logdir         = @logdir@
 raddbdir       = @raddbdir@
 radacctdir     = @radacctdir@

diff --git a/Makefile b/Makefile
index 4d8b65c..56154e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ install:
        $(INSTALL) -d -m 700    $(R)$(logdir)
        $(INSTALL) -d -m 700    $(R)$(radacctdir)
        $(INSTALL) -d -m 700    $(R)$(datadir)
+       $(INSTALL) -d -m 700    $(R)$(dictdir)
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
        for i in 1 5 8; do \
                $(INSTALL) -d -m 755    $(R)$(mandir)/man$$i; \
@@ -44,12 +45,12 @@ install:
                 $(INSTALL) -m 644 $$i $(R)$(raddbdir); \
        done; \
        chmod 600 $(R)$(raddbdir)/naspasswd $(R)$(raddbdir)/clients $(R)$(raddbdir)/clients.conf;
-       @echo "Creating/updating files in $(R)$(datadir)"; \
+       @echo "Creating/updating files in $(R)$(dictdir)"; \
        cd share; \
        for i in dictionary*; do \
-               [ ! -f $(R)$(datadir)/$$i ] && $(INSTALL) -m 644 $$i $(R)$(datadir); \
-               if [ "`find $$i -newer $(R)$(datadir)/$$i`" ]; then \
-                       echo "** $(R)$(datadir)/$$i"; \
+               [ ! -f $(R)$(dictdir)/$$i ] && $(INSTALL) -m 644 $$i $(R)$(dictdir); \
+               if [ "`find $$i -newer $(R)$(dictdir)/$$i`" ]; then \
+                       echo "** $(R)$(dictdir)/$$i"; \
                        nt=1; \
                fi; \
        done; \
@@ -59,7 +60,7 @@ install:
                echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
                echo "**";\
                echo "** The sample configuration files in `pwd`";\
-               echo "** are newer than those in $(R)$(datadir)";\
+               echo "** are newer than those in $(R)$(dictdir)";\
                echo "**";\
                echo "** Please investigate and manually copy (if appropriate) the files listed above.";\
                echo "**";\

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 2ec34a1..496b330 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -28,12 +28,16 @@ sbindir = @sbindir@
 logdir = @logdir@
 raddbdir = @raddbdir@
 radacctdir = @radacctdir@
-datadir = @datadir@/freeradius
+datadir = @datadir@
+
 
 #  Location of config and logfiles.
 confdir = ${raddbdir}
 run_dir = ${localstatedir}/run/radiusd
 
+#  Location of the dictionary files
+dictdir = ${datadir}/freeradius
+
 #
 #  The logging messages for the server are appended to the
 #  tail of this file.

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index d988e8a..c80eb86 100644 (file)
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -57,7 +57,7 @@ static gid_t server_gid;
  */
 static const char *localstatedir = NULL;
 static const char *prefix = NULL;
-static const char *data_dir = NULL;
+static const char *dict_dir = NULL;
 
 /*
  *  Map the proxy server configuration parameters to variables.
@@ -98,7 +98,7 @@ static CONF_PARSER server_config[] = {
        { "logdir",             PW_TYPE_STRING_PTR, 0, &radlog_dir,        "${localstatedir}/log"},
        { "libdir",             PW_TYPE_STRING_PTR, 0, &radlib_dir,        "${prefix}/lib"},
        { "radacctdir",         PW_TYPE_STRING_PTR, 0, &radacct_dir,       "${logdir}/radacct" },
-       { "datadir",             PW_TYPE_STRING_PTR, 0, &data_dir,          "${prefix}/share/freeradius"},
+       { "dictdir",             PW_TYPE_STRING_PTR, 0, &dict_dir,          "${datadir}/freeradius"},
        { "hostname_lookups",   PW_TYPE_BOOLEAN,    0, &librad_dodns,      "no" },
 #if WITH_SNMP
        { "snmp",               PW_TYPE_BOOLEAN,    0, &mainconfig.do_snmp,      "no" },
@@ -697,7 +697,8 @@ CONF_SECTION *read_radius_conf_file(void)
 
        /* Initialize the dictionary */
        DEBUG2("read_config_files:  reading dictionary");
-       if (dict_init(data_dir, RADIUS_DICTIONARY) != 0) {
+
+       if (dict_init(dict_dir, RADIUS_DICTIONARY) != 0) {
                radlog(L_ERR|L_CONS, "Errors reading dictionary: %s",
                                librad_errstr);
                cf_section_free(&cs);