Now that the dictionaries are no longer in raddb, update the

	compile-time defines.

diff --git a/src/include/build-radpaths-h.in b/src/include/build-radpaths-h.in
index 365eb3a..ccdc564 100644 (file)
--- a/src/include/build-radpaths-h.in
+++ b/src/include/build-radpaths-h.in
@@ -20,6 +20,7 @@ sbindir=@sbindir@
 mandir=@mandir@
 logdir=@logdir@
 raddbdir=@raddbdir@
+datadir=@datadir@
 radacctdir=@radacctdir@
 
 cat <<EOF > radpaths.h
@@ -27,6 +28,7 @@ cat <<EOF > radpaths.h
 #define LOGDIR         "@logdir@"
 #define LIBDIR         "@libdir@"
 #define RADDBDIR       "@raddbdir@"
+#define DICTDIR                "@datadir@/freeradius"
 #define RUNDIR         "@localstatedir@/run"
 #define SBINDIR                "@sbindir@"
 #define RADIR          "@radacctdir@"

diff --git a/src/main/radclient.c b/src/main/radclient.c
index cd9a8e4..2065647 100644 (file)
--- a/src/main/radclient.c
+++ b/src/main/radclient.c
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
        char *p;
        int c;
        int port = 0;
-       const char *radius_dir = RADDBDIR;
+       const char *dict_dir = DICTDIR;
        char *filename = NULL;
        FILE *fp;
        int count = 1;
@@ -232,7 +232,7 @@ int main(int argc, char **argv)
                        count = atoi(optarg);
                        break;
                case 'd':
-                       radius_dir = optarg;
+                       dict_dir = optarg;
                        break;
                case 'f':
                        filename = optarg;
@@ -309,7 +309,7 @@ int main(int argc, char **argv)
                usage();
        }
 
-       if (dict_init(radius_dir, RADIUS_DICTIONARY) < 0) {
+       if (dict_init(dict_dir, RADIUS_DICTIONARY) < 0) {
                librad_perror("radclient");
                return 1;
        }