summaryrefslogtreecommitdiff
path: root/conf/conf.c
diff options
context:
space:
mode:
Diffstat (limited to 'conf/conf.c')
-rw-r--r--conf/conf.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/conf/conf.c b/conf/conf.c
index d9bf9d88..47d4db4e 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -39,15 +39,12 @@ config_alloc(byte *name)
int
config_parse(struct config *c)
{
- struct proto_config *p;
-
debug("Parsing configuration file `%s'\n", c->file_name);
new_config = c;
- cfg_pool = c->pool;
cfg_mem = c->mem;
if (setjmp(conf_jmpbuf))
return 0;
- cf_lex_init(1);
+ cf_lex_init(0);
cf_lex_init_tables();
protos_preconfig(c);
rt_preconfig(c);
@@ -61,6 +58,18 @@ config_parse(struct config *c)
return 1;
}
+int
+cli_parse(struct config *c)
+{
+ new_config = c;
+ cfg_mem = c->mem;
+ if (setjmp(conf_jmpbuf))
+ return 0;
+ cf_lex_init(1);
+ cf_parse();
+ return 1;
+}
+
void
config_free(struct config *c)
{