[sudo-commits] sudo changeset 13672:19dc52bd9c6f

[Todd C. Miller]

changeset:	13672:19dc52bd9c6f in /raid/repos/sudo
details:	https://www.sudo.ws/repos/sudo/rev/19dc52bd9c6f
user:		Todd C. Miller <Todd.Miller at sudo.ws>
date:		Mon Nov 29 11:50:40 2021 -0700

Log Message:
	cvtsudoers: better merging of lists that are not exact duplicates
	When merging rules, if one list would be overridden by another,
	remove the overridden rule and continue merging.

diffstat:

 MANIFEST                                    |    3 +
 plugins/sudoers/cvtsudoers_merge.c          |  215 ++++++++++++++++++++-------
 plugins/sudoers/regress/cvtsudoers/sudoers1 |   96 ++++++++++++
 plugins/sudoers/regress/cvtsudoers/sudoers2 |   96 ++++++++++++
 plugins/sudoers/regress/cvtsudoers/sudoers3 |   96 ++++++++++++
 5 files changed, 452 insertions(+), 54 deletions(-)