[sudo-commits] sudo changeset 13706:bfdb2edfca71

[Todd C. Miller]

changeset:	13706:bfdb2edfca71 in /raid/repos/sudo
details:	https://www.sudo.ws/repos/sudo/rev/bfdb2edfca71
user:		Todd C. Miller <Todd.Miller at sudo.ws>
date:		Mon Jan 03 13:23:22 2022 -0700

Log Message:
	Fix merging of global/ALL entries when each input file has a host.
	If a host is specified for the input file, cvtsudoers will bind
	global Defaults to that host and change host "ALL" in a userspec
	to the host name.  However, if all the input files have matching
	hosts we can simplify the merged file by converting back to ALL
	after resolving conflicts.

diffstat:

 MANIFEST                                         |    2 +
 plugins/sudoers/cvtsudoers_merge.c               |  380 ++++++++++++++++++----
 plugins/sudoers/regress/cvtsudoers/test35.out.ok |    3 +-
 plugins/sudoers/regress/cvtsudoers/test36.out.ok |   13 +
 plugins/sudoers/regress/cvtsudoers/test36.sh     |    8 +
 5 files changed, 335 insertions(+), 71 deletions(-)