moparisthebest/sslh
1
0
Fork 0
mirror of https://github.com/moparisthebest/sslh synced 2024-11-28 03:52:21 -05:00
Code Issues Releases Wiki Activity

Print error message upon non-existent configuration file

Browse Source
This commit is contained in:
Yves Rutschle 2015-07-28 15:14:21 +02:00
parent ca461ea077
commit 4cbaf447b5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sslh-main.c
View File

@ -306,6 +306,7 @@ static int config_protocols(config_t *config, struct proto **prots)
* in: *filename * in: *filename
* out: *listen, a newly-allocated linked list of listen addrinfo * out: *listen, a newly-allocated linked list of listen addrinfo
* *prots, a newly-allocated linked list of protocols * *prots, a newly-allocated linked list of protocols
* 1 on error, 0 on success
*/ */
#ifdef LIBCONFIG #ifdef LIBCONFIG
static int config_parse(char *filename, struct addrinfo **listen, struct proto **prots) static int config_parse(char *filename, struct addrinfo **listen, struct proto **prots)
@ -319,12 +320,18 @@ static int config_parse(char *filename, struct addrinfo **listen, struct proto *
/* If it's a parse error then there will be a line number for the failure /* If it's a parse error then there will be a line number for the failure
* an I/O error (such as non-existent file) will have the error line as 0 * an I/O error (such as non-existent file) will have the error line as 0
*/ */
if (config_error_line(&config) != 0) {
fprintf(stderr, "%s:%d:%s\n", fprintf(stderr, "%s:%d:%s\n",
filename, filename,
config_error_line(&config), config_error_line(&config),
config_error_text(&config)); config_error_text(&config));
exit(1); exit(1);
} }
fprintf(stderr, "%s:%s\n",
filename,
config_error_text(&config));
return 1;
}
config_lookup_bool(&config, "verbose", &verbose); config_lookup_bool(&config, "verbose", &verbose);
config_lookup_bool(&config, "inetd", &inetd); config_lookup_bool(&config, "inetd", &inetd);
@ -399,10 +406,12 @@ static void cmdline_config(int argc, char* argv[], struct proto** prots)
optind = 1; optind = 1;
opterr = 0; /* we're missing protocol options at this stage so don't output errors */ opterr = 0; /* we're missing protocol options at this stage so don't output errors */
while ((c = getopt_long_only(argc, argv, optstr, all_options, NULL)) != -1) { while ((c = getopt_long_only(argc, argv, optstr, all_options, NULL)) != -1) {
if (c == 'v') {
verbose++;
}
if (c == 'F') { if (c == 'F') {
config_filename = optarg; config_filename = optarg;
if (config_filename) { if (config_filename) {
fprintf(stderr, "config: %s\n", config_filename);
res = config_parse(config_filename, &addr_listen, prots); res = config_parse(config_filename, &addr_listen, prots);
} else { } else {
/* No configuration file specified -- try default file locations */ /* No configuration file specified -- try default file locations */