Test cvtsudoers stdout and stderr separately.

Fixes a test failure on systems with musl libc.  Bug #873

diff --git a/MANIFEST b/MANIFEST
index 748ffad53f10aa441f3b238640d4937ff9433dcc..2e7d11a8cb06b1d9eed0ac8cb431026f3824c48c 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -450,6 +450,7 @@ plugins/sudoers/regress/cvtsudoers/test24.out.ok
 plugins/sudoers/regress/cvtsudoers/test24.sh
 plugins/sudoers/regress/cvtsudoers/test25.out.ok
 plugins/sudoers/regress/cvtsudoers/test25.sh
+plugins/sudoers/regress/cvtsudoers/test26.err.ok
 plugins/sudoers/regress/cvtsudoers/test26.out.ok
 plugins/sudoers/regress/cvtsudoers/test26.sh
 plugins/sudoers/regress/cvtsudoers/test27.out.ok
@@ -465,6 +466,7 @@ plugins/sudoers/regress/cvtsudoers/test30.sh
 plugins/sudoers/regress/cvtsudoers/test31.conf
 plugins/sudoers/regress/cvtsudoers/test31.out.ok
 plugins/sudoers/regress/cvtsudoers/test31.sh
+plugins/sudoers/regress/cvtsudoers/test32.err.ok
 plugins/sudoers/regress/cvtsudoers/test32.out.ok
 plugins/sudoers/regress/cvtsudoers/test32.sh
 plugins/sudoers/regress/cvtsudoers/test33.out.ok

diff --git a/plugins/sudoers/regress/cvtsudoers/test1.sh b/plugins/sudoers/regress/cvtsudoers/test1.sh
index e2ff3cfd86b967b839db652702965ee663fb5acf..c1bd00152a547f2b0b779c615d8dbbe0e6c33867 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test1.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test1.sh
@@ -3,7 +3,6 @@
 # Test user and host filters
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -m user=millert,host=hercules $TESTDIR/sudoers
 
 exit 0

diff --git a/plugins/sudoers/regress/cvtsudoers/test10.sh b/plugins/sudoers/regress/cvtsudoers/test10.sh
index 25df83c268af38ec073a4386689d8f2f952b033b..3ca1691cbd040ba047b37a0f42fd5c63c8af3a51 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test10.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test10.sh
@@ -3,7 +3,6 @@
 # Test command defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d command $TESTDIR/sudoers
 
 exit 0

diff --git a/plugins/sudoers/regress/cvtsudoers/test11.sh b/plugins/sudoers/regress/cvtsudoers/test11.sh
index 1466689aa87aebd4e1e5001efc873f091e7defc3..7cbae9fe868d56614c6f956d06bae31c8a5faed1 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test11.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test11.sh
@@ -3,5 +3,4 @@
 # Test that Aliases are removed when filtering by defaults type
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -d command $TESTDIR/sudoers.defs

diff --git a/plugins/sudoers/regress/cvtsudoers/test12.sh b/plugins/sudoers/regress/cvtsudoers/test12.sh
index ea0f6bcd311eccffa39cad6de47cdcba4df43b9d..3ac1f5958a5299582ac06e09ebacb1c3cdd8b99b 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test12.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test12.sh
@@ -3,5 +3,4 @@
 # Test that Aliases are removed when filtering by defaults type
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -d user $TESTDIR/sudoers.defs

diff --git a/plugins/sudoers/regress/cvtsudoers/test13.sh b/plugins/sudoers/regress/cvtsudoers/test13.sh
index 4dd4750ca75c5d187d8d40ba14b66a804e3dbab4..44424263dd5c312ae174b9f13cf34b347cfed51e 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test13.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test13.sh
@@ -3,5 +3,4 @@
 # Test that Aliases are removed when filtering by defaults type
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -d host $TESTDIR/sudoers.defs

diff --git a/plugins/sudoers/regress/cvtsudoers/test14.sh b/plugins/sudoers/regress/cvtsudoers/test14.sh
index 3f310760e822e2746a49de47d706fe959407b640..90637a71e1f4e59c42736e244f837b1f76281121 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test14.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test14.sh
@@ -3,5 +3,4 @@
 # Test that Aliases are removed when filtering by defaults type
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -d runas $TESTDIR/sudoers.defs

diff --git a/plugins/sudoers/regress/cvtsudoers/test15.sh b/plugins/sudoers/regress/cvtsudoers/test15.sh
index 04a2788293d54f65e28b5b97795dc5f291f77f36..5e02f61920fed9bca35ef7c0585472648049ac45 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test15.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test15.sh
@@ -3,7 +3,6 @@
 # Test filters and pruning
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m user=user1 <<EOF
 user1, user2, user3, %group1 host1, host2, host3 = ALL
 EOF

diff --git a/plugins/sudoers/regress/cvtsudoers/test16.sh b/plugins/sudoers/regress/cvtsudoers/test16.sh
index 712cdeb8f4425203d548f7b9c0bbee7edcc03a83..636037c85c5f3a8aa7c8e819719557441c072bdc 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test16.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test16.sh
@@ -3,7 +3,6 @@
 # Test filters and pruning
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m user=user2,host=host2 <<EOF
 user1, user2, user3, %group1 host1, host2, host3 = ALL
 EOF

diff --git a/plugins/sudoers/regress/cvtsudoers/test17.sh b/plugins/sudoers/regress/cvtsudoers/test17.sh
index 9892de4941f3f143576be127ab65e728a9597251..f79eccd6c8836d6f3cec0b02b5e71713ebad2f1e 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test17.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test17.sh
@@ -3,7 +3,6 @@
 # Test filters and pruning
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=host1 <<EOF
 user1, user2, user3, %group1 host1, host2, host3 = ALL
 EOF

diff --git a/plugins/sudoers/regress/cvtsudoers/test18.sh b/plugins/sudoers/regress/cvtsudoers/test18.sh
index 5ce7c888451ae7b0c6afcc3467f164144a0241d2..98fb0693723003b865f953315fdf423cf9174792 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test18.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test18.sh
@@ -3,7 +3,6 @@
 # Test filters and pruning
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=somehost <<EOF
 user1, user2, user3, %group1 ALL = ALL
 EOF

diff --git a/plugins/sudoers/regress/cvtsudoers/test19.sh b/plugins/sudoers/regress/cvtsudoers/test19.sh
index f434f2a3fb3475c71ad71fb4393e752b8f7656e2..4669dd3c9ee78e4f896a1c6980d8cb3cbe01282c 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test19.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test19.sh
@@ -3,5 +3,4 @@
 # Test filters and pruning; alias contents don't get pruned
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m user=FULLTIMERS,host=SERVERS $TESTDIR/sudoers

diff --git a/plugins/sudoers/regress/cvtsudoers/test2.sh b/plugins/sudoers/regress/cvtsudoers/test2.sh
index e7f19f684776706a13ebf0f5f2c3021260b1f02f..1c799f145ba28e6ceddf4c6ec24aa1f95b92b97b 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test2.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test2.sh
@@ -3,7 +3,6 @@
 # Test user and host filters, expanding aliases
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -e -m user=millert,host=hercules $TESTDIR/sudoers
 
 exit 0

diff --git a/plugins/sudoers/regress/cvtsudoers/test20.sh b/plugins/sudoers/regress/cvtsudoers/test20.sh
index e7214e2dc5701605d64c6414dbe6181890ef5c26..e909077324124424aa5282ec099f249dd2e55b9f 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test20.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test20.sh
@@ -3,7 +3,6 @@
 # Test cvtsudoers.conf
 #
 
-exec 2>&1
 ./cvtsudoers -c $TESTDIR/test20.conf <<EOF
 Defaults:SOMEUSERS authenticate, timestamp_timeout=0
 User_Alias SOMEUSERS = user1, user2, user3

diff --git a/plugins/sudoers/regress/cvtsudoers/test21.sh b/plugins/sudoers/regress/cvtsudoers/test21.sh
index 66c18b6cf600cfb46829ea01eb952261d6883804..3dde768fad823ef82980741e5444ffd45127686f 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test21.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test21.sh
@@ -3,7 +3,6 @@
 # Test cvtsudoers.conf
 #
 
-exec 2>&1
 ./cvtsudoers -c $TESTDIR/test21.conf <<EOF
 Defaults authenticate, timestamp_timeout=0
 User_Alias FULLTIMERS = user1, user2, user3

diff --git a/plugins/sudoers/regress/cvtsudoers/test22.sh b/plugins/sudoers/regress/cvtsudoers/test22.sh
index 7c757166b6465071fea8d7cfabc8bea2d0b9843c..88c003a65f2e8df545dd8ef888a588aaa0b32e8e 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test22.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test22.sh
@@ -3,7 +3,6 @@
 # Test LDAP base filtering.
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
 dn: dc=sudo,dc=ws
 objectClass: dcObject

diff --git a/plugins/sudoers/regress/cvtsudoers/test23.sh b/plugins/sudoers/regress/cvtsudoers/test23.sh
index d5f04390eee5512e0e875c671b6abff5088f5e3a..79d516e4ed139541f55cb5362e162ca040318d09 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test23.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test23.sh
@@ -3,6 +3,5 @@
 # Test round-tripping of sudoers -> LDIF -> sudoers
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" $TESTDIR/test23.out.ok | \
     ./cvtsudoers -c "" -i LDIF -f sudoers | grep -v '^#'

diff --git a/plugins/sudoers/regress/cvtsudoers/test24.sh b/plugins/sudoers/regress/cvtsudoers/test24.sh
index 632502ea9a9f301d5f0ada0b2262cb401f14ebb4..0399715a9edfade0872cf32ab6e1ad79fc64f24f 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test24.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test24.sh
@@ -3,6 +3,5 @@
 # Test round-tripping of LDIF -> sudoers -> LDIF
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i LDIF -f sudoers $TESTDIR/test24.out.ok | \
     ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws"

diff --git a/plugins/sudoers/regress/cvtsudoers/test25.sh b/plugins/sudoers/regress/cvtsudoers/test25.sh
index 4cb8b457282b28478cfb3e0dcb596742830c0fe1..3ecb88e2cc8fc9b3f227d3bbaef7ba50723a5bed 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test25.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test25.sh
@@ -3,7 +3,6 @@
 # Test LDIF base64 attribute parsing
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
 # defaults, SUDOers, sudo.ws
 dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz 

diff --git a/plugins/sudoers/regress/cvtsudoers/test26.err.ok b/plugins/sudoers/regress/cvtsudoers/test26.err.ok
new file mode 100644 (file)
index 0000000..769f392
--- /dev/null
+++ b/plugins/sudoers/regress/cvtsudoers/test26.err.ok
@@ -0,0 +1,3 @@
+cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA==
+cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M=
+cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!==

diff --git a/plugins/sudoers/regress/cvtsudoers/test26.out.ok b/plugins/sudoers/regress/cvtsudoers/test26.out.ok
index 769f392d865bf9372471b78c91d89d5a9ca2449d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/plugins/sudoers/regress/cvtsudoers/test26.out.ok
+++ b/plugins/sudoers/regress/cvtsudoers/test26.out.ok
@@ -1,3 +0,0 @@
-cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA==
-cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M=
-cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!==

diff --git a/plugins/sudoers/regress/cvtsudoers/test26.sh b/plugins/sudoers/regress/cvtsudoers/test26.sh
index b9eecaa458878662d2b807722fb2ede95dd4443f..6ee022c41d94460e8d1aa627b19c27470cbf7fee 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test26.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test26.sh
@@ -3,7 +3,6 @@
 # Test LDIF invalid base64 attribute parsing
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
 # defaults, SUDOers, sudo.ws
 dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz 

diff --git a/plugins/sudoers/regress/cvtsudoers/test27.sh b/plugins/sudoers/regress/cvtsudoers/test27.sh
index afc29a88078cf87e9f91c44578e249b3cd673487..689bdafe586ff547d3b4d81d146f3391c8b0a205 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test27.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test27.sh
@@ -3,7 +3,6 @@
 # Test base64 encoding of non-safe strings
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -b "ou=SUDOers©,dc=sudo,dc=ws" <<EOF
 Defaults badpass_message="Bad password¡"
 

diff --git a/plugins/sudoers/regress/cvtsudoers/test28.sh b/plugins/sudoers/regress/cvtsudoers/test28.sh
index 73c4a5074790107400c619d406f0e7eb9821444a..5ce1e023a1be0e7942d864ae2028eec64560a41b 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test28.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test28.sh
@@ -3,7 +3,6 @@
 # Test LDAP sudoOrder when converting to sudoers.
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
 dn: dc=sudo,dc=ws
 objectClass: dcObject

diff --git a/plugins/sudoers/regress/cvtsudoers/test29.sh b/plugins/sudoers/regress/cvtsudoers/test29.sh
index 6f0148c77868b00008553e8af123ea4f08667557..cec4bd47ba79e60cc3b768d82ec971b0ff220424 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test29.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test29.sh
@@ -3,7 +3,6 @@
 # Test LDAP sudoOrder when converting to sudoers.
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
 dn: dc=sudo,dc=ws
 objectClass: dcObject

diff --git a/plugins/sudoers/regress/cvtsudoers/test3.sh b/plugins/sudoers/regress/cvtsudoers/test3.sh
index 472d252385d4f741bd10cf03032b2a9e0f2e55bf..21d9e6c75790e3a3332975282d7d726020bb6690 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test3.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test3.sh
@@ -3,7 +3,6 @@
 # Test group and host filters
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -m group=wheel,host=blackhole $TESTDIR/sudoers
 
 exit 0

diff --git a/plugins/sudoers/regress/cvtsudoers/test30.sh b/plugins/sudoers/regress/cvtsudoers/test30.sh
index 80b08a574f6ad51a61d79d4e38ef39d4b0345f0f..20aa9ea5a1aa582dafd49acac678adbe4a4330ac 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test30.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test30.sh
@@ -4,7 +4,6 @@
 # See https://bugzilla.sudo.ws/show_bug.cgi?id=853
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -e -f json <<EOF
 Cmnd_Alias     CMDA=/path/to/cmda
 Cmnd_Alias     CMDB=/path/to/cmdb

diff --git a/plugins/sudoers/regress/cvtsudoers/test31.sh b/plugins/sudoers/regress/cvtsudoers/test31.sh
index ad6537c14c5d2469ffda7f342078a3bfea7a9894..026c8ec064f6c71eeb2cd3ee84d69eed211d2e8b 100644 (file)
--- a/plugins/sudoers/regress/cvtsudoers/test31.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test31.sh
@@ -3,7 +3,6 @@
 # Test cvtsudoers.conf with padding
 #
 
-exec 2>&1
 ./cvtsudoers -c $TESTDIR/test31.conf <<EOF
 Defaults authenticate, timestamp_timeout=0
 User_Alias FULLTIMERS = user1, user2, user3

diff --git a/plugins/sudoers/regress/cvtsudoers/test32.err.ok b/plugins/sudoers/regress/cvtsudoers/test32.err.ok
new file mode 100644 (file)
index 0000000..c001436
--- /dev/null
+++ b/plugins/sudoers/regress/cvtsudoers/test32.err.ok
@@ -0,0 +1 @@
+cvtsudoers: too many sudoers entries, maximum 10

diff --git a/plugins/sudoers/regress/cvtsudoers/test32.out.ok b/plugins/sudoers/regress/cvtsudoers/test32.out.ok
index 436b87787e68c4b20d1c7f32cf0dd7755a46725a..99001993d635bc332d644165ce99b4e87f1a336d 100644 (file)
--- a/plugins/sudoers/regress/cvtsudoers/test32.out.ok
+++ b/plugins/sudoers/regress/cvtsudoers/test32.out.ok
@@ -1,4 +1,3 @@
-cvtsudoers: too many sudoers entries, maximum 10
 dn: cn=user0,ou=SUDOers,dc=my-domain,dc=com
 objectClass: top
 objectClass: sudoRole

diff --git a/plugins/sudoers/regress/cvtsudoers/test32.sh b/plugins/sudoers/regress/cvtsudoers/test32.sh
index fe9c065cd031a7cafb1b6fbdc6b5559b1692a8aa..62cac091d21d010ab287f66e23fcd1770f2ec781 100644 (file)
--- a/plugins/sudoers/regress/cvtsudoers/test32.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test32.sh
@@ -3,7 +3,6 @@
 # Test cvtsudoers.conf with invalid padding
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -b "ou=SUDOers,dc=my-domain,dc=com" -O 1000 -P 1 <<EOF
 user0  ALL = (ALL:ALL) ALL
 user1  ALL = (ALL:ALL) ALL

diff --git a/plugins/sudoers/regress/cvtsudoers/test33.sh b/plugins/sudoers/regress/cvtsudoers/test33.sh
index db8d8d17977086c1ca3fce025974cc38c01581c5..a84c165eb54b929b13b691abb1231c97d5d49fd2 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test33.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test33.sh
@@ -3,7 +3,6 @@
 # Test LDAP negated sudoRunAsUser and sudoRunAsGroup converted to sudoers.
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
 dn: dc=sudo,dc=ws
 objectClass: dcObject

diff --git a/plugins/sudoers/regress/cvtsudoers/test4.sh b/plugins/sudoers/regress/cvtsudoers/test4.sh
index 17c2a252ab56e666a52bb9421e48df5184bc4215..e5e13de3966b856a26413bc62abb910dd780064e 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test4.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test4.sh
@@ -3,7 +3,6 @@
 # Test group and host filters, expanding aliases
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -e -m group=wheel,host=blackhole $TESTDIR/sudoers
 
 exit 0

diff --git a/plugins/sudoers/regress/cvtsudoers/test5.sh b/plugins/sudoers/regress/cvtsudoers/test5.sh
index 1c41772f0ba4a71aa88381b7ea65ba03e3844103..1e7cdcf26d8067a32e7f6e9ae537c4e6b2469788 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test5.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test5.sh
@@ -3,7 +3,6 @@
 # Test defaults type filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d all $TESTDIR/sudoers
 
 exit 0

diff --git a/plugins/sudoers/regress/cvtsudoers/test6.sh b/plugins/sudoers/regress/cvtsudoers/test6.sh
index 289fad97706c73b149d24089a5a2f66a12a1e180..cebb9575c863c1f6eb2a8ebc42577015a729f3d5 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test6.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test6.sh
@@ -3,7 +3,6 @@
 # Test global defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d global $TESTDIR/sudoers
 
 exit 0

diff --git a/plugins/sudoers/regress/cvtsudoers/test7.sh b/plugins/sudoers/regress/cvtsudoers/test7.sh
index 63af529077ebef540c1a403b3372daf98edafe58..3ebdb69dfe0b596ba74130d92b20a93a2d076909 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test7.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test7.sh
@@ -3,7 +3,6 @@
 # Test user defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d user $TESTDIR/sudoers
 
 exit 0

diff --git a/plugins/sudoers/regress/cvtsudoers/test8.sh b/plugins/sudoers/regress/cvtsudoers/test8.sh
index 785e0b55d49e03191fd7ef7770310b445d2d625f..109c21920afd8b2685f4087e42b4e7c1c4720b28 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test8.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test8.sh
@@ -3,7 +3,6 @@
 # Test runas defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d runas $TESTDIR/sudoers
 
 exit 0

diff --git a/plugins/sudoers/regress/cvtsudoers/test9.sh b/plugins/sudoers/regress/cvtsudoers/test9.sh
index de64a481c09a3bf2504232fd835bec1817162c20..18b4c517066e1133a5f4235e2d174becaebd02cd 100755 (executable)
--- a/plugins/sudoers/regress/cvtsudoers/test9.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test9.sh
@@ -3,7 +3,6 @@
 # Test host defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d host $TESTDIR/sudoers
 
 exit 0