diff --git a/MANIFEST b/MANIFEST index 10353708a..42811f0dc 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,12 +1,12 @@ ABOUT-NLS ChangeLog -INSTALL.md INSTALL.configure +INSTALL.md MANIFEST Makefile.in NEWS -README.md README.LDAP.md +README.md aclocal.m4 autogen.sh config.h.in @@ -758,6 +758,8 @@ plugins/sudoers/regress/cvtsudoers/test32.out.ok plugins/sudoers/regress/cvtsudoers/test32.sh plugins/sudoers/regress/cvtsudoers/test33.out.ok plugins/sudoers/regress/cvtsudoers/test33.sh +plugins/sudoers/regress/cvtsudoers/test34.out.ok +plugins/sudoers/regress/cvtsudoers/test34.sh plugins/sudoers/regress/cvtsudoers/test4.out.ok plugins/sudoers/regress/cvtsudoers/test4.sh plugins/sudoers/regress/cvtsudoers/test5.out.ok diff --git a/plugins/sudoers/regress/cvtsudoers/test34.out.ok b/plugins/sudoers/regress/cvtsudoers/test34.out.ok new file mode 100644 index 000000000..6b410e1bd --- /dev/null +++ b/plugins/sudoers/regress/cvtsudoers/test34.out.ok @@ -0,0 +1,15 @@ +Defaults@xerxes log_output +Defaults log_output +Defaults!/usr/bin/sudoreplay !log_output +Defaults!/usr/local/bin/sudoreplay !log_output +Defaults!REBOOT !log_output + +User_Alias ADMINS = millert, dowdy, mikef +Cmnd_Alias PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice,\ + /usr/bin/pkill, /usr/bin/top +Cmnd_Alias REBOOT = /sbin/halt, /sbin/reboot, /sbin/poweroff +Host_Alias WEBSERVERS = www1, www2, www3 +Host_Alias WEBSERVERS_1 = www1, www2, www3, www5 +Host_Alias WEBSERVERS_2 = www1, www2, www3, www4 + +root ALL = (ALL) ALL diff --git a/plugins/sudoers/regress/cvtsudoers/test34.sh b/plugins/sudoers/regress/cvtsudoers/test34.sh new file mode 100755 index 000000000..46b2b651d --- /dev/null +++ b/plugins/sudoers/regress/cvtsudoers/test34.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# +# Test cvtsudoers merge +# + +: ${CVTSUDOERS=cvtsudoers} + +$CVTSUDOERS -f sudoers xerxes:${TESTDIR}/sudoers1 ${TESTDIR}/sudoers2 xyzzy:${TESTDIR}/sudoers3 2>/dev/null