rename raddb_dir variables and API to conf_dir

diff --git a/src/bin/dhcpclient.c b/src/bin/dhcpclient.c
index 4b5fcb9a464eef0266e9320ef7edec43ba5bf99f..0e18301e025f474554a78c63e554eed93ec0fbbf 100644 (file)
--- a/src/bin/dhcpclient.c
+++ b/src/bin/dhcpclient.c
@@ -537,7 +537,7 @@ int main(int argc, char **argv)
        static fr_ipaddr_t      client_ipaddr;
 
        int                     c;
-       char const              *raddb_dir = CONFDIR;
+       char const              *confdir = CONFDIR;
        char const              *dict_dir = DICTDIR;
        char const              *filename = NULL;
 
@@ -564,7 +564,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'd':
-                       raddb_dir = optarg;
+                       confdir = optarg;
                        break;
 
                case 'f':
@@ -617,7 +617,7 @@ int main(int argc, char **argv)
                fr_exit(EXIT_FAILURE);
        }
 
-       if (fr_dict_read(fr_dict_unconst(dict_freeradius), raddb_dir, FR_DICTIONARY_FILE) == -1) {
+       if (fr_dict_read(fr_dict_unconst(dict_freeradius), confdir, FR_DICTIONARY_FILE) == -1) {
                fr_perror("dhcpclient");
                fr_exit(EXIT_FAILURE);
        }

diff --git a/src/bin/radclient-ng.c b/src/bin/radclient-ng.c
index d52aedcdfe6c15476ad3069de6e05f89f505964b..596b01a90f6891dd2f12b5f5a3e85d3087af7287 100644 (file)
--- a/src/bin/radclient-ng.c
+++ b/src/bin/radclient-ng.c
@@ -1313,7 +1313,7 @@ int main(int argc, char **argv)
 {
        int             ret = EXIT_SUCCESS;
        int             c;
-       char            const *raddb_dir = CONFDIR;
+       char            const *confdir = CONFDIR;
        char            const *dict_dir = DICTDIR;
        char            *end;
        char            filesecret[256];
@@ -1456,7 +1456,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'd':
-                       raddb_dir = optarg;
+                       confdir = optarg;
                        break;
 
                        /*
@@ -1690,7 +1690,7 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       if (fr_dict_read(fr_dict_unconst(dict_freeradius), raddb_dir, FR_DICTIONARY_FILE) == -1) {
+       if (fr_dict_read(fr_dict_unconst(dict_freeradius), confdir, FR_DICTIONARY_FILE) == -1) {
                fr_log_perror(&default_log, L_ERR, __FILE__, __LINE__, NULL,
                              "Failed to initialize the dictionaries");
                exit(EXIT_FAILURE);

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index 4b55c5c542777f821f25d00aa2940d9916a368ac..2c91500787877718de8426561f5c04cad928e702 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -1621,7 +1621,7 @@ int main(int argc, char **argv)
 {
        int             ret = EXIT_SUCCESS;
        int             c;
-       char            const *raddb_dir = CONFDIR;
+       char            const *confdir = CONFDIR;
        char            const *dict_dir = DICTDIR;
        char            filesecret[256];
        FILE            *fp;
@@ -1720,7 +1720,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'd':
-                       raddb_dir = optarg;
+                       confdir = optarg;
                        break;
 
                case 'e':       /* magical extra stuff */
@@ -1920,7 +1920,7 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       if (fr_dict_read(fr_dict_unconst(dict_freeradius), raddb_dir, FR_DICTIONARY_FILE) == -1) {
+       if (fr_dict_read(fr_dict_unconst(dict_freeradius), confdir, FR_DICTIONARY_FILE) == -1) {
                fr_log_perror(&default_log, L_ERR, __FILE__, __LINE__, NULL,
                              "Failed to initialize the dictionaries");
                exit(EXIT_FAILURE);

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 04e20a30cfa199adc7f8d538ef6813ae6757f35f..743e112e9c83cd49132af5621ffac6d4f42e303a 100644 (file)
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
        main_config_t           *config = NULL;
        bool                    talloc_memory_report = false;
 
-       bool                    raddb_dir_set = false;
+       bool                    confdir_set = false;
 
        size_t                  pool_size = 0;
        void                    *pool_page_start = NULL;
@@ -359,8 +359,8 @@ int main(int argc, char *argv[])
                        break;
 
                case 'd':
-                       main_config_raddb_dir_set(config, optarg);
-                       raddb_dir_set = true;
+                       main_config_confdir_set(config, optarg);
+                       confdir_set = true;
                        break;
 
                case 'D':
@@ -474,10 +474,10 @@ int main(int argc, char *argv[])
         *      configuration directory without changing the scripts
         *      being executed.
         */
-       if (!raddb_dir_set) {
-               char const *raddb_dir = getenv("FREERADIUS_CONFIG_DIR");
+       if (!confdir_set) {
+               char const *confdir = getenv("FREERADIUS_CONFIG_DIR");
 
-               if (raddb_dir) main_config_raddb_dir_set(config, raddb_dir);
+               if (confdir) main_config_confdir_set(config, confdir);
        }
 
        /*
@@ -822,7 +822,7 @@ do { \
         */
        if (unlang_global_init() < 0) EXIT_WITH_FAILURE;
 
-       if (server_init(config->root_cs, config->raddb_dir, fr_dict_unconst(fr_dict_internal())) < 0) EXIT_WITH_FAILURE;
+       if (server_init(config->root_cs, config->confdir, fr_dict_unconst(fr_dict_internal())) < 0) EXIT_WITH_FAILURE;
 
        /*
         *  Everything seems to have loaded OK, exit gracefully.

diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index aa3f1ae4aa5c8b6abb941794bbeeea1008c00647..8c70e4e3b0974ff4bd6abbf13a653f03610c9a13 100644 (file)
--- a/src/bin/radsniff.c
+++ b/src/bin/radsniff.c
@@ -2335,7 +2335,7 @@ int main(int argc, char *argv[])
        int                     c;
        unsigned int            timeout = 0;
        fr_timer_t              *timeout_ev = NULL;
-       char const              *raddb_dir = CONFDIR;
+       char const              *confdir = CONFDIR;
        char const              *dict_dir = DICTDIR;
        TALLOC_CTX              *autofree;
 
@@ -2445,7 +2445,7 @@ int main(int argc, char *argv[])
                        break;
 
                case 'd':
-                       raddb_dir = optarg;
+                       confdir = optarg;
                        break;
 
                case 'D':
@@ -2733,7 +2733,7 @@ int main(int argc, char *argv[])
                goto finish;
        }
 
-       if (fr_dict_read(fr_dict_unconst(dict_freeradius), raddb_dir, FR_DICTIONARY_FILE) == -1) {
+       if (fr_dict_read(fr_dict_unconst(dict_freeradius), confdir, FR_DICTIONARY_FILE) == -1) {
                fr_perror("radsniff");
                ret = 64;
                goto finish;

diff --git a/src/bin/radsnmp.c b/src/bin/radsnmp.c
index 525bbe90cac33223bf16cabf82be8b939b97bbc5..a883459aacd81dbdc6cc161e74a0b7c4eecb3e3e 100644 (file)
--- a/src/bin/radsnmp.c
+++ b/src/bin/radsnmp.c
@@ -80,7 +80,7 @@ typedef struct {
        fr_dict_attr_t const    *snmp_op;               //!< SNMP operation.
        fr_dict_attr_t const    *snmp_type;             //!< SNMP type attribute.
        fr_dict_attr_t const    *snmp_failure;          //!< SNMP set error attribute.
-       char const              *raddb_dir;             //!< Radius dictionary directory.
+       char const              *confdir;               //!< Radius dictionary directory.
        char const              *dict_dir;              //!< Dictionary director.
        unsigned int            code;                   //!< Request type.
        int                     proto;                  //!< Protocol TCP/UDP.
@@ -913,7 +913,7 @@ int main(int argc, char **argv)
        conf = talloc_zero(autofree, radsnmp_conf_t);
        conf->proto = IPPROTO_UDP;
        conf->dict_dir = DICTDIR;
-       conf->raddb_dir = CONFDIR;
+       conf->confdir = CONFDIR;
        conf->secret = talloc_strdup(conf, "testing123");
        conf->timeout = fr_time_delta_from_sec(3);
        conf->retries = 5;
@@ -945,7 +945,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'd':
-                       conf->raddb_dir = optarg;
+                       conf->confdir = optarg;
                        break;
 
                case 'l':
@@ -1053,7 +1053,7 @@ int main(int argc, char **argv)
                fr_exit_now(EXIT_FAILURE);
        }
 
-       if (fr_dict_read(fr_dict_unconst(dict_freeradius), conf->raddb_dir, FR_DICTIONARY_FILE) == -1) {
+       if (fr_dict_read(fr_dict_unconst(dict_freeradius), conf->confdir, FR_DICTIONARY_FILE) == -1) {
                fr_perror("radsnmp");
                fr_exit_now(EXIT_FAILURE);
        }

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index 1173ccf42e16d1a159747e4187825bfcc39efb77..3b5cdb364f715db346d9d9fdc890eaff58fc69db 100644 (file)
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -203,7 +203,7 @@ typedef struct {
 typedef struct {
        fr_dict_t               *dict;                  //!< Dictionary to "reset" to.
        fr_dict_gctx_t const    *dict_gctx;             //!< Dictionary gctx to "reset" to.
-       char const              *raddb_dir;
+       char const              *confdir;
        char const              *dict_dir;
        char const              *fuzzer_dir;            //!< Where to write fuzzer files.
        CONF_SECTION            *features;              //!< Enabled features.
@@ -4313,7 +4313,7 @@ int main(int argc, char *argv[])
        bool                    exit_now = false;
 
        command_config_t        config = {
-                                       .raddb_dir = CONFDIR,
+                                       .confdir = CONFDIR,
                                        .dict_dir = DICTDIR
                                };
 
@@ -4372,7 +4372,7 @@ int main(int argc, char *argv[])
                        break;
 
                case 'd':
-                       config.raddb_dir = optarg;
+                       config.confdir = optarg;
                        break;
 
                case 'D':

diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c
index c8ec52ab0e63c636093f9f4f8fb1b45e6115c865..5a5b20b83eed7d0e06e97679e7672af9ee163942 100644 (file)
--- a/src/bin/unit_test_map.c
+++ b/src/bin/unit_test_map.c
@@ -159,7 +159,7 @@ static int process_file(char const *filename)
 int main(int argc, char *argv[])
 {
        int                     c, ret = EXIT_SUCCESS;
-       char const              *raddb_dir = CONFDIR;
+       char const              *confdir = CONFDIR;
        char const              *dict_dir = DICTDIR;
        fr_dict_t               *dict = NULL;
        char const              *receipt_file = NULL;
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
 
        while ((c = getopt(argc, argv, "d:D:xMhr:")) != -1) switch (c) {
                case 'd':
-                       raddb_dir = optarg;
+                       confdir = optarg;
                        break;
 
                case 'D':
@@ -246,7 +246,7 @@ int main(int argc, char *argv[])
        /*
         *      Load the custom dictionary
         */
-       if (fr_dict_read(dict, raddb_dir, FR_DICTIONARY_FILE) == -1) {
+       if (fr_dict_read(dict, confdir, FR_DICTIONARY_FILE) == -1) {
                fr_strerror_const_push("Failed to initialize the dictionaries");
                fr_perror("unit_test_map");
                EXIT_WITH_FAILURE;

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 284ce63c7af132d8a8307b6a85ec1787a798380f..789cb924cde4df3061763e9eef42c6481c76c9ac 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -792,7 +792,7 @@ int main(int argc, char *argv[])
                                break;
 
                        case 'd':
-                               main_config_raddb_dir_set(config, optarg);
+                               main_config_confdir_set(config, optarg);
                                break;
 
                        case 'D':
@@ -922,7 +922,7 @@ int main(int argc, char *argv[])
        /*
         *      Load the custom dictionary
         */
-       if (fr_dict_read(dict, config->raddb_dir, FR_DICTIONARY_FILE) == -1) {
+       if (fr_dict_read(dict, config->confdir, FR_DICTIONARY_FILE) == -1) {
                PERROR("Failed to initialize the dictionaries");
                EXIT_WITH_FAILURE;
        }
@@ -999,7 +999,7 @@ int main(int argc, char *argv[])
                client_add(NULL, client);
        }
 
-       if (server_init(config->root_cs, config->raddb_dir, dict) < 0) EXIT_WITH_FAILURE;
+       if (server_init(config->root_cs, config->confdir, dict) < 0) EXIT_WITH_FAILURE;
 
        vs = virtual_server_find("default");
        if (!vs) {
@@ -1354,7 +1354,7 @@ static NEVER_RETURNS void usage(main_config_t const *config, int status)
        fprintf(output, "Usage: %s [options]\n", config->name);
        fprintf(output, "Options:\n");
        fprintf(output, "  -c <count>         Run packets through the interpreter <count> times\n");
-       fprintf(output, "  -d <raddb_dir>     Configuration files are in \"raddb_dir/*\".\n");
+       fprintf(output, "  -d <confdir>     Configuration files are in \"confdir/*\".\n");
        fprintf(output, "  -D <dict_dir>      Dictionary files are in \"dict_dir/*\".\n");
        fprintf(output, "  -f <file>          Filter reply against attributes in 'file'.\n");
        fprintf(output, "  -h                 Print this help message.\n");

diff --git a/src/lib/server/main_config.c b/src/lib/server/main_config.c
index cae6ff4ced4616e76e996eb83beb8ab4f85548bf..109dbdcb53dac627fd6be10097204be4c4d6dfe4 100644 (file)
--- a/src/lib/server/main_config.c
+++ b/src/lib/server/main_config.c
@@ -829,13 +829,13 @@ void main_config_name_set_default(main_config_t *config, char const *name, bool
  * @param[in] config   to alter.
  * @param[in] name     to set as dir root e.g. /usr/local/etc/raddb.
  */
-void main_config_raddb_dir_set(main_config_t *config, char const *name)
+void main_config_confdir_set(main_config_t *config, char const *name)
 {
-       if (config->raddb_dir) {
-               talloc_const_free(config->raddb_dir);
-               config->raddb_dir = NULL;
+       if (config->confdir) {
+               talloc_const_free(config->confdir);
+               config->confdir = NULL;
        }
-       if (name) config->raddb_dir = talloc_typed_strdup(config, name);
+       if (name) config->confdir = talloc_typed_strdup(config, name);
 }
 
 /** Clean up the semaphore when the main config is freed
@@ -907,7 +907,7 @@ int main_config_exclusive_proc(main_config_t *config)
                }
                MEM(path = talloc_typed_strdup(config, config->pid_file));
        }  else {
-               MEM(path = talloc_asprintf(config, "%s/%s.conf", config->raddb_dir, config->name));
+               MEM(path = talloc_asprintf(config, "%s/%s.conf", config->confdir, config->name));
        }
 
 #ifdef HAVE_SEMAPHORES
@@ -984,7 +984,7 @@ main_config_t *main_config_alloc(TALLOC_CTX *ctx)
         *      Set the defaults from compile time arguments
         *      these can be overridden later on the command line.
         */
-       main_config_raddb_dir_set(config, CONFDIR);
+       main_config_confdir_set(config, CONFDIR);
        main_config_dict_dir_set(config, DICTDIR);
 
        main_config = config;
@@ -1018,15 +1018,15 @@ int main_config_init(main_config_t *config)
         */
        xlat_func_init();
 
-       if (stat(config->raddb_dir, &statbuf) < 0) {
-               ERROR("Error checking raddb_dir \"%s\": %s", config->raddb_dir, fr_syserror(errno));
+       if (stat(config->confdir, &statbuf) < 0) {
+               ERROR("Error checking confdir \"%s\": %s", config->confdir, fr_syserror(errno));
                return -1;
        }
 
 #ifdef S_IWOTH
        if ((statbuf.st_mode & S_IWOTH) != 0) {
                ERROR("Configuration directory %s is globally writable. "
-                     "Refusing to start due to insecure configuration", config->raddb_dir);
+                     "Refusing to start due to insecure configuration", config->confdir);
                return -1;
        }
 #endif
@@ -1034,7 +1034,7 @@ int main_config_init(main_config_t *config)
 #if 0 && defined(S_IROTH)
        if (statbuf.st_mode & S_IROTH != 0) {
                ERROR("Configuration directory %s is globally readable. "
-                     "Refusing to start due to insecure configuration", config->raddb_dir);
+                     "Refusing to start due to insecure configuration", config->confdir);
                return -1;
        }
 #endif
@@ -1094,9 +1094,9 @@ int main_config_init(main_config_t *config)
 
        /*
         *      @todo - not quite done yet... these dictionaries have
-        *      to be loaded from raddb_dir.  But the
+        *      to be loaded from confdir.  But the
         *      fr_dict_autoload_t has a base_dir pointer
-        *      there... it's probably best to pass raddb_dir into
+        *      there... it's probably best to pass confdir into
         *      fr_dict_autoload() and have it use that instead.
         *
         *      Once that's done, the proto_foo dictionaries SHOULD be
@@ -1115,7 +1115,7 @@ int main_config_init(main_config_t *config)
        if (fr_debug_lvl) cf_md5_init();
 
        /* Read the configuration file */
-       snprintf(buffer, sizeof(buffer), "%.200s/%.50s.conf", config->raddb_dir, config->name);
+       snprintf(buffer, sizeof(buffer), "%.200s/%.50s.conf", config->confdir, config->name);
        if (cf_file_read(cs, buffer) < 0) {
                ERROR("Error reading or parsing %s", buffer);
                goto failure;

diff --git a/src/lib/server/main_config.h b/src/lib/server/main_config.h
index 73be934fa2d79e352537b3cac1f32fc6e9c749fc..3a1b9b15ad1b2478ff93453b0e450fa3a28fb4db 100644 (file)
--- a/src/lib/server/main_config.h
+++ b/src/lib/server/main_config.h
@@ -73,7 +73,7 @@ struct main_config_s {
        char const      *lib_dir;
        char const      *sbin_dir;
        char const      *run_dir;
-       char const      *raddb_dir;                     //!< Path to raddb directory
+       char const      *confdir;                       //!< Path to raddb directory
 
        char const      *prefix;
 
@@ -159,7 +159,7 @@ struct main_config_s {
 };
 
 void                   main_config_name_set_default(main_config_t *config, char const *name, bool overwrite_config);
-void                   main_config_raddb_dir_set(main_config_t *config, char const *path);
+void                   main_config_confdir_set(main_config_t *config, char const *path);
 void                   main_config_dict_dir_set(main_config_t *config, char const *path);
 
 int                    main_config_parse_option(char const *value); /* flat / nested migration */

diff --git a/src/lib/util/paths.c b/src/lib/util/paths.c
index 1c6118811e53b2959af3844a897f2a60a5c7b55f..d32cdbf5cbd973f33fadaef5d6fef57ec23b21ba 100644 (file)
--- a/src/lib/util/paths.c
+++ b/src/lib/util/paths.c
@@ -50,7 +50,7 @@ char const *fr_path_default_lib_dir(void)
  * This is set at build time from --prefix
  * @return the value of CONFDIR
  */
-char const *fr_path_default_raddb_dir(void)
+char const *fr_path_default_confdir(void)
 {
        return CONFDIR;
 }

diff --git a/src/lib/util/paths.h b/src/lib/util/paths.h
index 4370f2ef6a3d4f4a5b1553cb7ceb4867f5cad0d2..b694aa496bede7ca1eef338f52dd246a24ed216c 100644 (file)
--- a/src/lib/util/paths.h
+++ b/src/lib/util/paths.h
@@ -31,7 +31,7 @@ extern "C" {
 
 char const     *fr_path_default_log_dir(void);
 char const     *fr_path_default_lib_dir(void);
-char const     *fr_path_default_raddb_dir(void);
+char const     *fr_path_default_confdir(void);
 char const     *fr_path_default_run_dir(void);
 char const     *fr_path_default_sbin_dir(void);
 char const     *fr_path_default_radacct_dir(void);

diff --git a/src/listen/control/radmin.c b/src/listen/control/radmin.c
index 1428871c9b2f77511ee413a11045012fb7e74223..3f1572d3df003ccaff961616bd4f80ea2993341c 100644 (file)
--- a/src/listen/control/radmin.c
+++ b/src/listen/control/radmin.c
@@ -164,7 +164,7 @@ static NEVER_RETURNS void usage(int status)
 {
        FILE *output = status ? stderr : stdout;
        fprintf(output, "Usage: %s [ args ]\n", progname);
-       fprintf(output, "  -d raddb_dir    Configuration files are in \"raddbdir/*\".\n");
+       fprintf(output, "  -d confdir    Configuration files are in \"raddbdir/*\".\n");
        fprintf(output, "  -D <dictdir>    Set main dictionary directory (defaults to " DICTDIR ").\n");
        fprintf(output, "  -e command      Execute 'command' and then exit.\n");
        fprintf(output, "  -E              Echo commands as they are being executed.\n");
@@ -837,7 +837,7 @@ int main(int argc, char **argv)
        char const              *server = NULL;
        fr_dict_t               *dict = NULL;
 
-       char const              *raddb_dir = RADIUS_DIR;
+       char const              *confdir = RADIUS_DIR;
        char const              *dict_dir = DICTDIR;
 #ifdef USE_READLINE_HISTORY
        char                    history_file[PATH_MAX];
@@ -884,7 +884,7 @@ int main(int argc, char **argv)
                                fprintf(stderr, "%s: -d and -f cannot be used together.\n", progname);
                                fr_exit_now(EXIT_FAILURE);
                        }
-                       raddb_dir = optarg;
+                       confdir = optarg;
                        break;
 
                case 'D':
@@ -905,7 +905,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'f':
-                       raddb_dir = NULL;
+                       confdir = NULL;
                        file = optarg;
                        break;
 
@@ -959,7 +959,7 @@ int main(int argc, char **argv)
                fr_exit_now(EXIT_FAILURE);
        }
 
-       if (raddb_dir) {
+       if (confdir) {
                int             rcode;
                uid_t           uid;
                gid_t           gid;
@@ -968,7 +968,7 @@ int main(int argc, char **argv)
 
                file = NULL;    /* MUST read it from the conf_file now */
 
-               snprintf(io_buffer, sizeof(io_buffer), "%s/%s.conf", raddb_dir, name);
+               snprintf(io_buffer, sizeof(io_buffer), "%s/%s.conf", confdir, name);
 
                /*
                 *      Need to read in the dictionaries, else we may get
@@ -984,7 +984,7 @@ int main(int argc, char **argv)
                        fr_exit_now(64);
                }
 
-               if (fr_dict_read(dict, raddb_dir, FR_DICTIONARY_FILE) == -1) {
+               if (fr_dict_read(dict, confdir, FR_DICTIONARY_FILE) == -1) {
                        fr_perror("radmin");
                        fr_exit_now(64);
                }

diff --git a/src/listen/ldap_sync/sync_touch.c b/src/listen/ldap_sync/sync_touch.c
index f98288c398d2dc4c3b369f1d5e982576eabe8593..54a21d6aaf2ca0fbc743d21eedfbd88dca399a13 100644 (file)
--- a/src/listen/ldap_sync/sync_touch.c
+++ b/src/listen/ldap_sync/sync_touch.c
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
        conf = talloc_zero(NULL, sync_touch_conf_t);
        conf->proto = IPPROTO_UDP;
        conf->dict_dir = DICTDIR;
-       conf->raddb_dir = CONFDIR;
+       conf->confdir = CONFDIR;
        conf->secret = talloc_strdup(conf, "testing123");
        conf->timeout = fr_time_delta_from_sec(3);
        conf->retries = 5;
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
                fr_exit_now(EXIT_FAILURE);
        }
 
-       if (fr_dict_read(dict_freeradius, conf->raddb_dir, FR_DICTIONARY_FILE) == -1) {
+       if (fr_dict_read(dict_freeradius, conf->confdir, FR_DICTIONARY_FILE) == -1) {
                fr_perror("sync_touch");
                fr_exit_now(EXIT_FAILURE);
        }

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index d6ea7fa6f4cc7bf2085b468be3f9ee129367e3d9..add630fcec0cb2b598810a2203cc20f3bb3d9f38 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@ -696,7 +696,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
 
        if (!inst->filename) {
                MEM(inst->filename = talloc_typed_asprintf(inst, "%s/%s",
-                                                          main_config->raddb_dir, config->sql_db));
+                                                          main_config->confdir, config->sql_db));
        }
 
        /*