From 1c6a5adba2e6727fb078784ce60dfc150dfa1186 Mon Sep 17 00:00:00 2001
From: aland <aland>
Date: Mon, 31 Dec 2007 10:50:39 +0000
Subject: [PATCH] 	Add "dictionary" config item, so dictionaries don't
 have to 	be in raddb_dir.  Used mostly for testing...

---
 src/main/mainconfig.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index 5ff44d7..8fc35d7 100644
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -60,6 +60,7 @@ static uid_t server_uid;
 static gid_t server_gid;
 static const char *uid_name = NULL;
 static const char *gid_name = NULL;
+static const char *dictionary_dir = NULL;
 static int allow_core_dumps = 0;
 
 /*
@@ -193,6 +194,7 @@ static const CONF_PARSER server_config[] = {
 	{ "debug_level", PW_TYPE_INTEGER, 0, &mainconfig.debug_level, "0"},
 
 	{ "proxy_requests", PW_TYPE_BOOLEAN, 0, &mainconfig.proxy_requests, "yes" },
+	{ "dictionary",         PW_TYPE_STRING_PTR, 0, &dictionary_dir,   NULL },
 	{ "log", PW_TYPE_SUBSECTION, 0, NULL,  (const void *) log_config},
 	{ "security", PW_TYPE_SUBSECTION, 0, NULL, (const void *) security_config },
 	{ NULL, -1, 0, NULL, NULL }
@@ -519,6 +521,7 @@ static const FR_NAME_NUMBER str2dest[] = {
  */
 int read_mainconfig(int reload)
 {
+	const char *p = NULL;
 	static int old_debug_level = -1;
 	char buffer[1024];
 	CONF_SECTION *cs, *templates;
@@ -660,8 +663,10 @@ int read_mainconfig(int reload)
 	}
 
 	/* Initialize the dictionary */
-	DEBUG2("including dictionary file %s/%s", radius_dir, RADIUS_DICTIONARY);
-	if (dict_init(radius_dir, RADIUS_DICTIONARY) != 0) {
+	p = radius_dir;
+	if (dictionary_dir) p = dictionary_dir;
+	DEBUG2("including dictionary file %s/%s", p, RADIUS_DICTIONARY);
+	if (dict_init(p, RADIUS_DICTIONARY) != 0) {
 		radlog(L_ERR, "Errors reading dictionary: %s",
 				librad_errstr);
 		return -1;
-- 
2.1.4