[sudo-commits] sudo changeset 13761:9b8ad3d1e163

[Todd C. Miller]

changeset:	13761:9b8ad3d1e163 in /raid/repos/sudo
details:	https://www.sudo.ws/repos/sudo/rev/9b8ad3d1e163
user:		Todd C. Miller <Todd.Miller at sudo.ws>
date:		Mon Jan 31 19:18:04 2022 -0700

Log Message:
	defaults_check_conflict: it is only really a conflict if the binding match
	If the Defaults name matched but the binding does not, we can simply
	leave it be.  Fixes a problem where given two sudoers sources that
	have a host specified, if they contain conflicting Defaults entries
	we would drop one of the Defaults instead of keeping both after
	making them host-specific.

diffstat:

 MANIFEST                                         |   2 ++
 plugins/sudoers/cvtsudoers_merge.c               |  14 ++++++++++----
 plugins/sudoers/regress/cvtsudoers/test38.out.ok |  14 ++++++++++++++
 plugins/sudoers/regress/cvtsudoers/test38.sh     |  10 ++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)