mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-02 23:35:36 +00:00
Code Issues Releases Wiki Activity

Rename "log_server" in sudoers to "log_servers" to match I/O plugin.

Browse Source
This commit is contained in:
Todd C. Miller
2019-11-18 09:39:03 -07:00
parent 810669c4f0
commit f913249dd0
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/sudoers.man.in
View File

@@ -25,7 +25,7 @@
.nr BA @BAMAN@ .nr BA @BAMAN@
.nr LC @LCMAN@ .nr LC @LCMAN@
.nr PS @PSMAN@ .nr PS @PSMAN@
.TH "SUDOERS" "@mansectform@" "November 8, 2019" "Sudo @PACKAGE_VERSION@" "File Formats Manual" .TH "SUDOERS" "@mansectform@" "November 18, 2019" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
.nh .nh
.if n .ad l .if n .ad l
.SH "NAME" .SH "NAME"
@@ -4471,13 +4471,13 @@ should run
to get their accustomed editor configuration instead of to get their accustomed editor configuration instead of
invoking the editor directly. invoking the editor directly.
.TP 18n .TP 18n
log_server log_servers
Starting with Starting with
\fBsudo\fR \fBsudo\fR
1.9, it is possible to send I/O logs to a remote server instead of 1.9, it is possible to send I/O logs to a remote server instead of
logging them locally. logging them locally.
The The
\fIlog_server\fR \fIlog_servers\fR
setting specifies one or more server addresses to use when storing setting specifies one or more server addresses to use when storing
I/O logs remotely. I/O logs remotely.
Log servers must be running Log servers must be running
@@ -4491,7 +4491,7 @@ The host portion may be a host name, an IPv4 address, or an IPv6 address
in square brackets. in square brackets.
.sp .sp
When When
\fIlog_server\fR \fIlog_servers\fR
is enabled, I/O logs will not be logged locally. is enabled, I/O logs will not be logged locally.
If no log servers are reachable, the user will not be able If no log servers are reachable, the user will not be able
to run a command unless the to run a command unless the
@@ -4927,7 +4927,7 @@ The
\fIiolog_file\fR \fIiolog_file\fR
option may be used to control the format of the session ID. option may be used to control the format of the session ID.
For remote logs, the For remote logs, the
\fIlog_server\fR \fIlog_servers\fR
setting is used to specify one or more log servers running setting is used to specify one or more log servers running
\fBsudo_logsrvd\fR \fBsudo_logsrvd\fR
or another server that implements the protocol described by or another server that implements the protocol described by

10
doc/sudoers.mdoc.in
View File

@@ -24,7 +24,7 @@
.nr BA @BAMAN@ .nr BA @BAMAN@
.nr LC @LCMAN@ .nr LC @LCMAN@
.nr PS @PSMAN@ .nr PS @PSMAN@
.Dd November 8, 2019 .Dd November 18, 2019
.Dt SUDOERS @mansectform@ .Dt SUDOERS @mansectform@
.Os Sudo @PACKAGE_VERSION@ .Os Sudo @PACKAGE_VERSION@
.Sh NAME .Sh NAME
@@ -4172,13 +4172,13 @@ should run
.Nm sudo Fl e ) .Nm sudo Fl e )
to get their accustomed editor configuration instead of to get their accustomed editor configuration instead of
invoking the editor directly. invoking the editor directly.
.It log_server .It log_servers
Starting with Starting with
.Nm sudo .Nm sudo
1.9, it is possible to send I/O logs to a remote server instead of 1.9, it is possible to send I/O logs to a remote server instead of
logging them locally. logging them locally.
The The
.Em log_server .Em log_servers
setting specifies one or more server addresses to use when storing setting specifies one or more server addresses to use when storing
I/O logs remotely. I/O logs remotely.
Log servers must be running Log servers must be running
@@ -4192,7 +4192,7 @@ The host portion may be a host name, an IPv4 address, or an IPv6 address
in square brackets. in square brackets.
.Pp .Pp
When When
.Em log_server .Em log_servers
is enabled, I/O logs will not be logged locally. is enabled, I/O logs will not be logged locally.
If no log servers are reachable, the user will not be able If no log servers are reachable, the user will not be able
to run a command unless the to run a command unless the
@@ -4597,7 +4597,7 @@ The
.Em iolog_file .Em iolog_file
option may be used to control the format of the session ID. option may be used to control the format of the session ID.
For remote logs, the For remote logs, the
.Em log_server .Em log_servers
setting is used to specify one or more log servers running setting is used to specify one or more log servers running
.Nm sudo_logsrvd .Nm sudo_logsrvd
or another server that implements the protocol described by or another server that implements the protocol described by

2
plugins/sudoers/def_data.c
View File

@@ -506,7 +506,7 @@ struct sudo_defs_types sudo_defs_table[] = {
N_("Log when a command is denied by sudoers"), N_("Log when a command is denied by sudoers"),
NULL, NULL,
}, { }, {
"log_server", T_LIST|T_BOOL, "log_servers", T_LIST|T_BOOL,
N_("Sudo log server(s) to connect to with optional port"), N_("Sudo log server(s) to connect to with optional port"),
NULL, NULL,
}, { }, {

4
plugins/sudoers/def_data.h
View File

@@ -232,8 +232,8 @@
#define def_log_allowed (sudo_defs_table[I_LOG_ALLOWED].sd_un.flag) #define def_log_allowed (sudo_defs_table[I_LOG_ALLOWED].sd_un.flag)
#define I_LOG_DENIED 116 #define I_LOG_DENIED 116
#define def_log_denied (sudo_defs_table[I_LOG_DENIED].sd_un.flag) #define def_log_denied (sudo_defs_table[I_LOG_DENIED].sd_un.flag)
#define I_LOG_SERVER 117 #define I_LOG_SERVERS 117
#define def_log_server (sudo_defs_table[I_LOG_SERVER].sd_un.list) #define def_log_servers (sudo_defs_table[I_LOG_SERVERS].sd_un.list)
#define I_LOG_SERVER_TIMEOUT 118 #define I_LOG_SERVER_TIMEOUT 118
#define def_log_server_timeout (sudo_defs_table[I_LOG_SERVER_TIMEOUT].sd_un.ival) #define def_log_server_timeout (sudo_defs_table[I_LOG_SERVER_TIMEOUT].sd_un.ival)

2
plugins/sudoers/def_data.in
View File

@@ -366,7 +366,7 @@ log_allowed
log_denied log_denied
T_FLAG T_FLAG
"Log when a command is denied by sudoers" "Log when a command is denied by sudoers"
log_server log_servers
T_LIST|T_BOOL T_LIST|T_BOOL
"Sudo log server(s) to connect to with optional port" "Sudo log server(s) to connect to with optional port"
log_server_timeout log_server_timeout

4
plugins/sudoers/policy.c
View File

@@ -725,8 +725,8 @@ sudoers_policy_exec_setup(char *argv[], char *envp[], mode_t cmnd_umask,
if ((command_info[info_len++] = sudo_new_key_val("iolog_group", def_iolog_group)) == NULL) if ((command_info[info_len++] = sudo_new_key_val("iolog_group", def_iolog_group)) == NULL)
goto oom; goto oom;
} }
if (!SLIST_EMPTY(&def_log_server)) { if (!SLIST_EMPTY(&def_log_servers)) {
char *log_servers = serialize_list("log_servers", &def_log_server); char *log_servers = serialize_list("log_servers", &def_log_servers);
if (log_servers == NULL) if (log_servers == NULL)
goto oom; goto oom;
command_info[info_len++] = log_servers; command_info[info_len++] = log_servers;