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

Allowed an fwknoprc stanza (-n) to be overriden by arguments from the command line.

Browse Source 
Added a sanity check to make sure the -n option is used with the --save-rc-stanza option.
This commit is contained in:
Franck Joncourt 2013-03-18 22:06:31 +01:00
parent 817a719a9c
commit d8090a8143
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/config_init.c
View File

@ -1154,6 +1154,13 @@ validate_options(fko_cli_options_t *options)
exit(EXIT_FAILURE);
}
if ( (options->save_rc_stanza == 1) && (options->use_rc_stanza[0] == 0) )
{
fprintf(stderr, "The option --save-rc-stanza must be used with the "
"--named-config option to specify the stanza to update.\n");
exit(EXIT_FAILURE);
}
if (options->spa_server_str[0] == 0x0)
{
fprintf(stderr,
@ -1269,6 +1276,10 @@ config_init(fko_cli_options_t *options, int argc, char **argv)
*/
process_rc_section(RC_SECTION_DEFAULT, options);
/* Load the user specified stanza from .fwknoprc file */
if ( (options->got_named_stanza) && (options->save_rc_stanza == 0) )
process_rc_section(options->use_rc_stanza, options);
/* Reset the options index so we can run through them again.
*/
optind = 0;
@ -1575,17 +1586,6 @@ config_init(fko_cli_options_t *options, int argc, char **argv)
}
}
/* Load the specified stanza */
if (options->got_named_stanza == 1)
{
options->save_rc_stanza = 0;
process_rc_section(options->use_rc_stanza, options);
}
/* Discard the save stanza since there is no args specified on the command line */
else
options->save_rc_stanza = 0;
/* Now that we have all of our options set, we can validate them */
validate_options(options);