From: Luke Howard Date: Mon, 14 Nov 2011 06:05:55 +0000 (+1100) Subject: remove dictionary configuration parameter X-Git-Tag: debian/0.0.5-1~25^2~3^2~5 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=radsecproxy.git;a=commitdiff_plain;h=f780ff204e39420aabf94a7fab4e2c37790b658f remove dictionary configuration parameter --- diff --git a/lib/conf.c b/lib/conf.c index f5d1b2b..84bd1a8 100644 --- a/lib/conf.c +++ b/lib/conf.c @@ -15,7 +15,6 @@ #if 0 # common config options - dictionary = STRING # common realm config options realm NAME { @@ -69,7 +68,6 @@ rs_context_read_config(struct rs_context *ctx, const char *config_file) }; cfg_opt_t opts[] = { - CFG_STR ("dictionary", NULL, CFGF_NONE), CFG_SEC ("realm", realm_opts, CFGF_TITLE | CFGF_MULTI), CFG_END () }; @@ -98,7 +96,6 @@ rs_context_read_config(struct rs_context *ctx, const char *config_file) if (config == NULL) return rs_err_ctx_push_fl (ctx, RSE_NOMEM, __FILE__, __LINE__, NULL); ctx->config = config; - config->dictionary = cfg_getstr (cfg, "dictionary"); for (i = 0; i < cfg_size (cfg, "realm"); i++) { diff --git a/lib/examples/client.conf b/lib/examples/client.conf index 07486c6..47528c8 100644 --- a/lib/examples/client.conf +++ b/lib/examples/client.conf @@ -1,5 +1,3 @@ -dictionary = "/usr/share/freeradius/dictionary" - realm blocking-udp { type = "UDP" timeout = 2 diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h index da4e99c..2274a99 100644 --- a/lib/include/radsec/radsec-impl.h +++ b/lib/include/radsec/radsec-impl.h @@ -62,7 +62,6 @@ struct rs_realm { /** Top configuration object. */ struct rs_config { - char *dictionary; struct rs_realm *realms; cfg_t *cfg; };