summaryrefslogblamecommitdiff
path: root/system/sudo/test-suite.patch
blob: eb19ff09c880b619eff181c055ea53620bd1efb1 (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407






















































































































































































































































































































































































































                                                                                                
# HG changeset patch
# User Todd C. Miller <Todd.Miller@sudo.ws>
# Date 1552053510 25200
# Node ID e82a381f4f3de693f880aab2781fd65c01030ec0
# Parent  09a915110812b9d6603995aa27be94b71c5df1e7
Test cvtsudoers stdout and stderr separately.
Fixes a test failure on systems with musl libc.  Bug #873

diff -r 09a915110812 -r e82a381f4f3d MANIFEST
--- a/MANIFEST	Wed Mar 06 20:15:11 2019 -0700
+++ b/MANIFEST	Fri Mar 08 06:58:30 2019 -0700
@@ -450,6 +450,7 @@
 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/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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test1.sh
--- a/plugins/sudoers/regress/cvtsudoers/test1.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test1.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test10.sh
--- a/plugins/sudoers/regress/cvtsudoers/test10.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test10.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test11.sh
--- a/plugins/sudoers/regress/cvtsudoers/test11.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test11.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test12.sh
--- a/plugins/sudoers/regress/cvtsudoers/test12.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test12.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test13.sh
--- a/plugins/sudoers/regress/cvtsudoers/test13.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test13.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test14.sh
--- a/plugins/sudoers/regress/cvtsudoers/test14.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test14.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test15.sh
--- a/plugins/sudoers/regress/cvtsudoers/test15.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test15.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test16.sh
--- a/plugins/sudoers/regress/cvtsudoers/test16.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test16.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test17.sh
--- a/plugins/sudoers/regress/cvtsudoers/test17.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test17.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test18.sh
--- a/plugins/sudoers/regress/cvtsudoers/test18.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test18.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test19.sh
--- a/plugins/sudoers/regress/cvtsudoers/test19.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test19.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test2.sh
--- a/plugins/sudoers/regress/cvtsudoers/test2.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test2.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test20.sh
--- a/plugins/sudoers/regress/cvtsudoers/test20.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test20.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test21.sh
--- a/plugins/sudoers/regress/cvtsudoers/test21.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test21.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test22.sh
--- a/plugins/sudoers/regress/cvtsudoers/test22.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test22.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test23.sh
--- a/plugins/sudoers/regress/cvtsudoers/test23.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test23.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test24.sh
--- a/plugins/sudoers/regress/cvtsudoers/test24.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test24.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test25.sh
--- a/plugins/sudoers/regress/cvtsudoers/test25.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test25.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.err.ok
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/sudoers/regress/cvtsudoers/test26.err.ok	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.out.ok
--- a/plugins/sudoers/regress/cvtsudoers/test26.out.ok	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test26.out.ok	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test26.sh
--- a/plugins/sudoers/regress/cvtsudoers/test26.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test26.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test27.sh
--- a/plugins/sudoers/regress/cvtsudoers/test27.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test27.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test28.sh
--- a/plugins/sudoers/regress/cvtsudoers/test28.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test28.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test29.sh
--- a/plugins/sudoers/regress/cvtsudoers/test29.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test29.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test3.sh
--- a/plugins/sudoers/regress/cvtsudoers/test3.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test3.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test30.sh
--- a/plugins/sudoers/regress/cvtsudoers/test30.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test30.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test31.sh
--- a/plugins/sudoers/regress/cvtsudoers/test31.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test31.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.err.ok
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/sudoers/regress/cvtsudoers/test32.err.ok	Fri Mar 08 06:58:30 2019 -0700
@@ -0,0 +1,1 @@
+cvtsudoers: too many sudoers entries, maximum 10
diff -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.out.ok
--- a/plugins/sudoers/regress/cvtsudoers/test32.out.ok	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test32.out.ok	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test32.sh
--- a/plugins/sudoers/regress/cvtsudoers/test32.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test32.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test33.sh
--- a/plugins/sudoers/regress/cvtsudoers/test33.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test33.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test4.sh
--- a/plugins/sudoers/regress/cvtsudoers/test4.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test4.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test5.sh
--- a/plugins/sudoers/regress/cvtsudoers/test5.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test5.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test6.sh
--- a/plugins/sudoers/regress/cvtsudoers/test6.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test6.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test7.sh
--- a/plugins/sudoers/regress/cvtsudoers/test7.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test7.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test8.sh
--- a/plugins/sudoers/regress/cvtsudoers/test8.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test8.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -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 -r 09a915110812 -r e82a381f4f3d plugins/sudoers/regress/cvtsudoers/test9.sh
--- a/plugins/sudoers/regress/cvtsudoers/test9.sh	Wed Mar 06 20:15:11 2019 -0700
+++ b/plugins/sudoers/regress/cvtsudoers/test9.sh	Fri Mar 08 06:58:30 2019 -0700
@@ -3,7 +3,6 @@
 # Test host defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d host $TESTDIR/sudoers
 
 exit 0