summaryrefslogtreecommitdiff
path: root/lib/conf.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/conf.c')
-rw-r--r--lib/conf.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/conf.c b/lib/conf.c
index 90fa256..14b7579 100644
--- a/lib/conf.c
+++ b/lib/conf.c
@@ -1,11 +1,12 @@
/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
- See the file COPYING for licensing information. */
+ See LICENSE for licensing information. */
#if defined HAVE_CONFIG_H
#include <config.h>
#endif
#include <confuse.h>
+#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <radsec/radsec.h>
@@ -16,10 +17,9 @@
#if 0
# common config options
- dictionary = STRING
# common realm config options
- realm NAME {
+ realm STRING {
type = "UDP"|"TCP"|"TLS"|"DTLS"
timeout = INT
retries = INT
@@ -34,7 +34,7 @@
}
# client specific realm config options
- realm NAME {
+ realm STRING {
server {
hostname = STRING
service = STRING
@@ -78,7 +78,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 ()
};
@@ -107,7 +106,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++)
{