DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

[client] return error exit status if --stanza-list cannot open the rc file

Browse Source
This commit is contained in:
Michael Rash 2014-04-04 23:02:09 -04:00
parent 0b6a407392
commit a65324bad1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/config_init.c
View File

@ -573,7 +573,7 @@ is_rc_param(const char *line, rc_file_param_t *param)
* *
* @param rcfile full path to the rcfile to parse * @param rcfile full path to the rcfile to parse
*/ */
static void static int
dump_configured_stanzas_from_rcfile(const char* rcfile) dump_configured_stanzas_from_rcfile(const char* rcfile)
{ {
FILE *rc; FILE *rc;
@ -586,7 +586,7 @@ dump_configured_stanzas_from_rcfile(const char* rcfile)
log_msg(LOG_VERBOSITY_WARNING, "Unable to open rc file: %s: %s", log_msg(LOG_VERBOSITY_WARNING, "Unable to open rc file: %s: %s",
rcfile, strerror(errno)); rcfile, strerror(errno));
return; return EXIT_FAILURE;
} }
log_msg(LOG_VERBOSITY_NORMAL, "The following stanzas are configured in %s :", rcfile); log_msg(LOG_VERBOSITY_NORMAL, "The following stanzas are configured in %s :", rcfile);
@ -615,6 +615,8 @@ dump_configured_stanzas_from_rcfile(const char* rcfile)
} }
fclose(rc); fclose(rc);
return EXIT_SUCCESS;
} }
/* Assign path to fwknop rc file /* Assign path to fwknop rc file
@ -1895,8 +1897,7 @@ config_init(fko_cli_options_t *options, int argc, char **argv)
if (options->stanza_list == 1) if (options->stanza_list == 1)
{ {
set_rc_file(rcfile, options); set_rc_file(rcfile, options);
dump_configured_stanzas_from_rcfile(rcfile); exit(dump_configured_stanzas_from_rcfile(rcfile));
exit(EXIT_SUCCESS);
} }
/* First process the .fwknoprc file. /* First process the .fwknoprc file.