Skip to content

Commit de029fc

Browse files
committed
merge sudo 1.9.4 from tip
--HG-- branch : 1.9
2 parents 365b412 + 833e273 commit de029fc

File tree

265 files changed

+19935
-16692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+19935
-16692
lines changed

ABOUT-NLS

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ work on translations can contact the appropriate team.
2222
===================
2323

2424
Some packages are "localizable" when properly installed; the programs
25-
they contain can be made to speak your own native language. Most such
25+
they contain can be made to speak your own local language. Most such
2626
packages use GNU 'gettext'. Other packages have their own ways to
2727
internationalization, predating GNU 'gettext'.
2828

INSTALL

+6-6
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ Optional features:
328328

329329
--with-interfaces=no, --without-interfaces
330330
This option keeps sudo from trying to glean the ip address
331-
from each attached Ethernet interface. It is only useful
331+
from each attached network interface. It is only useful
332332
on a machine where sudo's interface reading support does
333333
not work, which may be the case on some SysV-based OS's
334334
using STREAMS.
@@ -852,11 +852,11 @@ Options that set runtime-changeable default values:
852852
Sudoers option: runas_default
853853

854854
--with-secure-path[=PATH]
855-
Path used for every command run from sudo(8). If you don't trust the
856-
people running sudo to have a sane PATH environment variable you may
857-
want to use this. Another use is if you want to have the "root path"
858-
be separate from the "user path." You will need to customize the path
859-
for your site. NOTE: this is not applied to users in the group
855+
Path used for every command run from sudo(8). If you don't trust
856+
users to have a reasonable PATH environment variable you may want
857+
to use this. Another use is if you want to have the "root path"
858+
be separate from the "user path." You will need to customize the
859+
path for your site. NOTE: this is not applied to users in the group
860860
specified by --with-exemptgroup. If you do not specify a path,
861861
"/bin:/usr/ucb:/usr/bin:/usr/sbin:/sbin:/usr/etc:/etc" is used.
862862
Sudoers option: secure_path

MANIFEST

+15-7
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ include/sudo_debug.h
9191
include/sudo_digest.h
9292
include/sudo_dso.h
9393
include/sudo_event.h
94+
include/sudo_eventlog.h
9495
include/sudo_fatal.h
9596
include/sudo_gettext.h
9697
include/sudo_iolog.h
@@ -101,6 +102,12 @@ include/sudo_queue.h
101102
include/sudo_rand.h
102103
include/sudo_util.h
103104
install-sh
105+
lib/eventlog/Makefile.in
106+
lib/eventlog/eventlog.c
107+
lib/eventlog/logwrap.c
108+
lib/eventlog/regress/logwrap/check_wrap.c
109+
lib/eventlog/regress/logwrap/check_wrap.in
110+
lib/eventlog/regress/logwrap/check_wrap.out.ok
104111
lib/iolog/Makefile.in
105112
lib/iolog/host_port.c
106113
lib/iolog/hostcheck.c
@@ -287,7 +294,6 @@ lib/zlib/zlib.h
287294
lib/zlib/zutil.c
288295
lib/zlib/zutil.h
289296
logsrvd/Makefile.in
290-
logsrvd/eventlog.c
291297
logsrvd/iolog_writer.c
292298
logsrvd/logsrv_util.c
293299
logsrvd/logsrv_util.h
@@ -497,18 +503,17 @@ plugins/sudoers/insults.h
497503
plugins/sudoers/interfaces.c
498504
plugins/sudoers/interfaces.h
499505
plugins/sudoers/iolog.c
500-
plugins/sudoers/iolog_client.c
501506
plugins/sudoers/iolog_path_escapes.c
502-
plugins/sudoers/iolog_plugin.h
503507
plugins/sudoers/ldap.c
504508
plugins/sudoers/ldap_conf.c
505509
plugins/sudoers/ldap_util.c
506510
plugins/sudoers/linux_audit.c
507511
plugins/sudoers/linux_audit.h
508512
plugins/sudoers/locale.c
513+
plugins/sudoers/log_client.c
514+
plugins/sudoers/log_client.h
509515
plugins/sudoers/logging.c
510516
plugins/sudoers/logging.h
511-
plugins/sudoers/logwrap.c
512517
plugins/sudoers/match.c
513518
plugins/sudoers/match_addr.c
514519
plugins/sudoers/match_command.c
@@ -671,9 +676,6 @@ plugins/sudoers/regress/env_match/check_env_pattern.c
671676
plugins/sudoers/regress/env_match/data
672677
plugins/sudoers/regress/exptilde/check_exptilde.c
673678
plugins/sudoers/regress/iolog_plugin/check_iolog_plugin.c
674-
plugins/sudoers/regress/logging/check_wrap.c
675-
plugins/sudoers/regress/logging/check_wrap.in
676-
plugins/sudoers/regress/logging/check_wrap.out.ok
677679
plugins/sudoers/regress/parser/check_addr.c
678680
plugins/sudoers/regress/parser/check_addr.in
679681
plugins/sudoers/regress/parser/check_base64.c
@@ -829,6 +831,12 @@ plugins/sudoers/regress/testsudoers/test11.out.ok
829831
plugins/sudoers/regress/testsudoers/test11.sh
830832
plugins/sudoers/regress/testsudoers/test12.out.ok
831833
plugins/sudoers/regress/testsudoers/test12.sh
834+
plugins/sudoers/regress/testsudoers/test13.out.ok
835+
plugins/sudoers/regress/testsudoers/test13.sh
836+
plugins/sudoers/regress/testsudoers/test14.out.ok
837+
plugins/sudoers/regress/testsudoers/test14.sh
838+
plugins/sudoers/regress/testsudoers/test15.out.ok
839+
plugins/sudoers/regress/testsudoers/test15.sh
832840
plugins/sudoers/regress/testsudoers/test2.inc
833841
plugins/sudoers/regress/testsudoers/test2.out.ok
834842
plugins/sudoers/regress/testsudoers/test2.sh

Makefile.in

+7-6
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ shlib_mode = @SHLIB_MODE@
5656
# Version of python detected by configure (major.minor)
5757
python_version = @PYTHON_VERSION@
5858

59-
SUBDIRS = lib/util @ZLIB_SRC@ lib/iolog @LOGSRV_SRC@ @LOGSRVD_SRC@ \
60-
plugins/audit_json plugins/group_file plugins/sample_approval \
61-
plugins/sudoers plugins/system_group @PYTHON_PLUGIN_SRC@ src \
62-
include doc examples
59+
SUBDIRS = lib/util @ZLIB_SRC@ lib/eventlog lib/iolog @LOGSRV_SRC@ \
60+
@LOGSRVD_SRC@ plugins/audit_json plugins/group_file \
61+
plugins/sample_approval plugins/sudoers plugins/system_group \
62+
@PYTHON_PLUGIN_SRC@ src include doc examples
6363

6464
SAMPLES = plugins/sample
6565

@@ -210,14 +210,15 @@ siglist.c signame.c:
210210
depend: siglist.c signame.c
211211
$(scriptdir)/mkdep.pl \
212212
--srcdir=$(abs_top_srcdir) --builddir=$(abs_top_builddir) \
213-
lib/util/Makefile.in lib/zlib/Makefile.in \
213+
lib/util/Makefile.in lib/zlib/Makefile.in lib/eventlog/Makefile.in \
214214
lib/iolog/Makefile.in lib/logsrv/Makefile.in logsrvd/Makefile.in \
215215
plugins/group_file/Makefile.in plugins/sample/Makefile.in \
216216
plugins/sudoers/Makefile.in plugins/system_group/Makefile.in \
217217
plugins/python/Makefile.in \
218218
src/Makefile.in && \
219219
$(top_builddir)/config.status --file $(top_builddir)/lib/util/Makefile \
220220
--file $(top_builddir)/lib/zlib/Makefile \
221+
--file $(top_builddir)/lib/eventlog/Makefile \
221222
--file $(top_builddir)/lib/iolog/Makefile \
222223
--file $(top_builddir)/lib/logsrv/Makefile \
223224
--file $(top_builddir)/logsrvd/Makefile \
@@ -275,7 +276,7 @@ update-pot:
275276
-e 's/^mailsub="/gettext "/p' configure.ac \
276277
>> confstr.sh; \
277278
tmpfiles=confstr.sh; \
278-
cfiles="lib/iolog/*.c logsrvd/*.c plugins/sudoers/*.c plugins/sudoers/auth/*.c";; \
279+
cfiles="lib/eventlog/*.c lib/iolog/*.c logsrvd/*.c plugins/sudoers/*.c plugins/sudoers/auth/*.c";; \
279280
*) echo unknown domain $$domain; continue;; \
280281
esac; \
281282
$(XGETTEXT) $(XGETTEXT_OPTS) -d$$domain $$cfiles $$tmpfiles -o $$pot.tmp; \

NEWS

+73-9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,62 @@
1+
What's new in Sudo 1.9.4
2+
3+
* The sudoers parser will now detect when an upper-case reserved
4+
word is used when declaring an alias. Now instead of "syntax
5+
error, unexpected CHROOT, expecting ALIAS" the message will be
6+
"syntax error, reserved word CHROOT used as an alias name".
7+
Bug #941.
8+
9+
* Better handling of sudoers files without a final newline.
10+
The parser now adds a newline at end-of-file automatically which
11+
removes the need for special cases in the parser.
12+
13+
* Fixed a regression introduced in sudo 1.9.1 in the sssd back-end
14+
where an uninitialized pointer could be freed on an error path.
15+
GitHub issue #67.
16+
17+
* The core logging code is now shared between sudo_logsrvd and
18+
the sudoers plugin.
19+
20+
* JSON log entries sent to syslog now use "minimal" JSON which
21+
skips all non-essention whitespace.
22+
23+
* The sudoers plugin can now produce JSON-formatted logs. The
24+
"log_format" sudoers option can be used to select sudo or json
25+
format logs. The default is sudo format logs.
26+
27+
* The sudoers plugin and visudo now display the column number in
28+
syntax error messages in addition to the line number. Bug #841.
29+
30+
* If I/O logging is not enabled but "log_servers" is set, the
31+
sudoers plugin will now log accept events to sudo_logsrvd.
32+
Previously, the accept event was only sent when I/O logging was
33+
enabled. The sudoers plugin now sends reject and alert events too.
34+
35+
* The sudo logsrv protocol has been extended to allow an AlertMessage
36+
to contain an optional array of InfoMessage, as AcceptMessage
37+
and RejectMessage already do.
38+
39+
* Fixed a bug in sudo_logsrvd where receipt of SIGHUP would result
40+
in duplicate entries in the debug log when debugging was enabled.
41+
42+
* The visudo utility now supports EDITOR environment variables
43+
that use single or double quotes in the command arguments.
44+
Bug #942.
45+
46+
* The PAM session modules now run when sudo is set-user-ID root,
47+
which allows a module to determine the original user-ID.
48+
Bug #944.
49+
50+
* Fixed a regression introduced in sudo 1.8.24 in the LDAP back-end
51+
where sudoNotBefore and sudoNotAfter were applied even when the
52+
SUDOERS_TIMED setting was not present in ldap.conf. Bug #945.
53+
54+
* Sudo packages for macOS 11 now contain universal binaries that
55+
support both Intel and Apple Silicon CPUs.
56+
57+
* For sudo_logsrvd, an empty value for the "pid_file" setting in
58+
sudo_logsrvd.conf will now disable the process ID file.
59+
160
What's new in Sudo 1.9.3p1
261

362
* Fixed a regression introduced in sudo 1.9.3 where the configure
@@ -23,9 +82,9 @@ What's new in Sudo 1.9.3
2382
doesn't support symbol hiding.
2483

2584
* Sudo now uses a linker script to hide symbols even when the
26-
compiler has native symbol hiding support. This should make it
27-
easier to detect omissions in the symbol exports file, regardless
28-
of the platform.
85+
compiler supports symbol hiding. This should make it easier to
86+
detect omissions in the symbol exports file, regardless of the
87+
platform.
2988

3089
* Fixed the libssl dependency in Debian packages for older releases
3190
that use libssl1.0.0.
@@ -67,15 +126,20 @@ What's new in Sudo 1.9.3
67126

68127
* It is now possible to set the working directory or change the
69128
root directory on a per-command basis using the CWD and CHROOT
70-
options. There are also new Defaults settings, runchroot and
71-
runcwd, that can be used to set the working directory or root
72-
directory on a more global basis.
129+
options. CWD and CHROOT are now reserved words in sudoers--they
130+
can no longer be used as alias names. There are also new Defaults
131+
settings, runchroot and runcwd, that can be used to set the
132+
working directory or root directory on a more global basis.
73133

74134
* New -D (--chdir) and -R (--chroot) command line options can be
75135
used to set the working directory or root directory if the sudoers
76136
file allows it. This functionality is not enabled by default
77137
and must be explicitly enabled in the sudoers file.
78138

139+
* Fixed a regression introduced in sudo 1.9.1 where the sudoers_audit
140+
symbol could not be resolved when sudo is configured with the
141+
--enable-static-sudoers option. Bug #936 and GitHub issue #61.
142+
79143
What's new in Sudo 1.9.2
80144

81145
* Fixed package builds on RedHat Enterprise Linux 8.
@@ -1694,7 +1758,7 @@ What's new in Sudo 1.8.11
16941758

16951759
* Fixed a crash in the system_group plugin. Bug #653.
16961760

1697-
* Fixed sudoedit on platforms without a native version of the
1761+
* Fixed sudoedit on platforms without a system version of the
16981762
getprogname() function. Bug #654.
16991763

17001764
* Fixed compilation problems with some pre-C99 compilers.
@@ -2020,7 +2084,7 @@ What's new in Sudo 1.8.7?
20202084
* There is now a standalone sudo.conf manual page.
20212085

20222086
* Sudo now stores its libexec files in a "sudo" sub-directory instead
2023-
of in libexec itself. For backwards compatibility, if the plugin
2087+
of in libexec itself. For backward compatibility, if the plugin
20242088
is not found in the default plugin directory, sudo will check
20252089
the parent directory if the default directory ends in "/sudo".
20262090

@@ -2483,7 +2547,7 @@ What's new in Sudo 1.8.3?
24832547
* Added --enable-werror configure option for gcc's -Werror flag.
24842548

24852549
* Visudo no longer assumes all editors support the +linenumber
2486-
command line argument. It now uses a whitelist of editors known
2550+
command line argument. It now uses a allowlist of editors known
24872551
to support the option.
24882552

24892553
* Fixed matching of network addresses when a netmask is specified

config.h.in

+7-4
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,9 @@
466466
/* Define to 1 if you use LDAP for sudoers. */
467467
#undef HAVE_LDAP
468468

469+
/* Define to 1 if you have the <ldapssl.h> header file. */
470+
#undef HAVE_LDAPSSL_H
471+
469472
/* Define to 1 if you have the `ldapssl_init' function. */
470473
#undef HAVE_LDAPSSL_INIT
471474

@@ -764,7 +767,8 @@
764767
/* Define to 1 if you have the `SSL_CTX_get0_certificate' function. */
765768
#undef HAVE_SSL_CTX_GET0_CERTIFICATE
766769

767-
/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */
770+
/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function or macro.
771+
*/
768772
#undef HAVE_SSL_CTX_SET_CIPHERSUITES
769773

770774
/* Define to 1 if you have the `SSL_CTX_set_min_proto_version' function or
@@ -1186,9 +1190,8 @@
11861190
/* Define to 1 if the code in interfaces.c does not compile for you. */
11871191
#undef STUB_LOAD_INTERFACES
11881192

1189-
/* Define to 1 to compile support for sudo_logsrvd in the sudoers I/O log
1190-
plugin. */
1191-
#undef SUDOERS_IOLOG_CLIENT
1193+
/* Define to 1 to compile support for sudo_logsrvd in the sudoers plugin. */
1194+
#undef SUDOERS_LOG_CLIENT
11921195

11931196
/* An instance string to append to the username (separated by a slash) for
11941197
Kerberos V authentication. */

0 commit comments

Comments
 (0)