From f6b11a424b775c3d4e72e4a275ef348bd3ce8644 Mon Sep 17 00:00:00 2001 From: yrutschle Date: Fri, 17 Jul 2020 21:58:23 +0200 Subject: [PATCH] reset config file option to --config --- sslh-conf.c | 5 +++-- sslh-conf.h | 2 +- sslhconf.cfg | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sslh-conf.c b/sslh-conf.c index cf30519..bd84061 100644 --- a/sslh-conf.c +++ b/sslh-conf.c @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Fri Jun 19 23:36:04 2020. + * on Fri Jul 17 21:57:49 2020. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2019 Yves Rutschle @@ -1453,7 +1453,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg) char* errmsg; config_setting_t* s; void* argtable[] = { - sslhcfg_conffile = arg_filen("F", "conffile", "", 0, 1, "Specify configuration file"), + sslhcfg_conffile = arg_filen("F", "config", "", 0, 1, "Specify configuration file"), sslhcfg_verbose = arg_intn("v", "verbose", "", 0, 1, ""), sslhcfg_foreground = arg_litn("f", "foreground", 0, 1, "Run in foreground instead of as a daemon"), sslhcfg_inetd = arg_litn("i", "inetd", 0, 1, "Run in inetd mode: use stdin/stdout instead of network listen"), @@ -1487,6 +1487,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg) return 0; } + config_init(&c); if (sslhcfg_conffile->count) { if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) { diff --git a/sslh-conf.h b/sslh-conf.h index 0651d86..7c517b2 100644 --- a/sslh-conf.h +++ b/sslh-conf.h @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Fri Jun 19 23:36:04 2020. + * on Fri Jul 17 21:57:49 2020. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2019 Yves Rutschle diff --git a/sslhconf.cfg b/sslhconf.cfg index 17e93db..22ef3a7 100644 --- a/sslhconf.cfg +++ b/sslhconf.cfg @@ -9,7 +9,7 @@ parser: "sslh-conf.c"; printer: true; -conffile_option: ("F", "conffile"); +conffile_option: ("F", "config"); # List of includes to define runtime types # (bug in libconfig? if swallows the brackets if they start