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

sudoers: disable SO_KEEPALIVE socket option based on log_server_disable_keepalive flag in sudoers

Browse Source
This commit is contained in:
Laszlo Orban
2020-01-21 15:18:27 +01:00
committed by Todd C. Miller
parent 38160d0ccb
commit 6f3f45aa24
8 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/sudoers/iolog.c
View File

@@ -366,6 +366,15 @@ iolog_deserialize_info(struct iolog_details *details, char * const user_info[],
TIME_T_MAX, NULL);
continue;
}
if (strncmp(*cur, "log_server_keepalive=", sizeof("log_server_keepalive=") - 1) == 0) {
int val = sudo_strtobool(*cur + sizeof("log_server_keepalive=") - 1);
if (val != -1) {
details->tcp_keepalive = val;
} else {
details->tcp_keepalive = true;
}
continue;
}
#if defined(HAVE_OPENSSL)
if (strncmp(*cur, "log_server_cabundle=", sizeof("log_server_cabundle=") - 1) == 0) {
details->ca_bundle = *cur + sizeof("log_server_cabundle=") - 1;
@@ -594,7 +603,7 @@ sudoers_io_open_remote(void)
debug_decl(sudoers_io_open_remote, SUDOERS_DEBUG_PLUGIN);
/* Connect to log server. */
sock = log_server_connect(iolog_details.log_servers,
sock = log_server_connect(iolog_details.log_servers, iolog_details.tcp_keepalive,
&iolog_details.server_timeout, &connected_server);
if (sock == -1) {
/* TODO: support offline logs if server unreachable */