isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix parsing of "retry_interval" in the relay section.

Browse Source 
The setting was present but the callback was missing so it could
not be parsed in the conf file.
This commit is contained in:
Todd C. Miller
2022-02-01 13:08:40 -07:00
parent 2df2276d56
commit ad719d06be
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
logsrvd/logsrvd_conf.c
View File

@@ -830,6 +830,22 @@ cb_relay_dir(struct logsrvd_config *config, const char *str, size_t offset)
debug_return_bool(true); debug_return_bool(true);
} }
static bool
cb_retry_interval(struct logsrvd_config *config, const char *str, size_t offset)
{
time_t interval;
const char *errstr;
debug_decl(cb_retry_interval, SUDO_DEBUG_UTIL);
interval = sudo_strtonum(str, 0, TIME_T_MAX, &errstr);
if (errstr != NULL)
debug_return_bool(false);
config->relay.retry_interval = interval;
debug_return_bool(true);
}
static bool static bool
cb_relay_store_first(struct logsrvd_config *config, const char *str, size_t offset) cb_relay_store_first(struct logsrvd_config *config, const char *str, size_t offset)
{ {
@@ -1087,6 +1103,7 @@ static struct logsrvd_config_entry relay_conf_entries[] = {
{ "timeout", cb_relay_timeout }, { "timeout", cb_relay_timeout },
{ "connect_timeout", cb_relay_connect_timeout }, { "connect_timeout", cb_relay_connect_timeout },
{ "relay_dir", cb_relay_dir }, { "relay_dir", cb_relay_dir },
{ "retry_interval", cb_retry_interval },
{ "store_first", cb_relay_store_first }, { "store_first", cb_relay_store_first },
{ "tcp_keepalive", cb_relay_keepalive }, { "tcp_keepalive", cb_relay_keepalive },
#if defined(HAVE_OPENSSL) #if defined(HAVE_OPENSSL)