DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

[server] minor update to replace a string compare for command cycle close exclusions

Browse Source
This commit is contained in:
Michael Rash
2015-11-17 21:19:59 -08:00
parent 47663f4215
commit 0bf4993071
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/access.c
+10 -2
View File
@@ -1292,8 +1292,13 @@ acc_data_is_valid(fko_srv_options_t *opts,
);
return(0);
}
if(acc->cmd_cycle_timer == 0
&& strncmp(acc->cmd_cycle_close, "NONE", 4) != 0)
/* Allow the string "NONE" to short-circuit close command execution.
*/
if(strncmp(acc->cmd_cycle_close, "NONE", 4) == 0)
acc->cmd_cycle_do_close = 0;
if(acc->cmd_cycle_timer == 0 && acc->cmd_cycle_do_close)
{
log_msg(LOG_ERR,
"[*] Must set the CMD_CYCLE_TIMER for command cycle functionality: '%s'",
@@ -1614,7 +1619,10 @@ parse_access_file(fko_srv_options_t *opts)
&(curr_acc->cmd_exec_gid), val,
"CMD_EXEC_GROUP", file_ptr, opts);
else if(CONF_VAR_IS(var, "CMD_CYCLE_OPEN"))
{
add_acc_string(&(curr_acc->cmd_cycle_open), val, file_ptr, opts);
curr_acc->cmd_cycle_do_close = 1; /* default, will be validated */
}
else if(CONF_VAR_IS(var, "CMD_CYCLE_CLOSE"))
add_acc_string(&(curr_acc->cmd_cycle_close), val, file_ptr, opts);
else if(CONF_VAR_IS(var, "CMD_CYCLE_TIMER"))
server/cmd_cycle.c
+1 -3
View File
@@ -296,9 +296,7 @@ cmd_cycle_open(fko_srv_options_t *opts, acc_stanza_t *acc,
if(! cmd_open(opts, acc, spadat, stanza_num))
return 0;
/* Allow the string "NONE" to short-circuit close command execution.
*/
if(strncmp(acc->cmd_cycle_close, "NONE", 4) != 0)
if(acc->cmd_cycle_do_close)
if(! add_cmd_close(opts, acc, spadat, stanza_num))
return 0;
server/fwknopd_common.h
+1
View File
@@ -388,6 +388,7 @@ typedef struct acc_stanza
char *cmd_exec_group;
char *cmd_cycle_open;
char *cmd_cycle_close;
unsigned char cmd_cycle_do_close;
int cmd_cycle_timer;
uid_t cmd_exec_uid;
gid_t cmd_exec_gid;