58 lines
1.6 KiB
Diff
58 lines
1.6 KiB
Diff
From 60f0d65e22ba93988229453eb013728e47e5f84e Mon Sep 17 00:00:00 2001
|
|
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
|
|
Date: Wed, 17 Oct 2018 06:57:06 -0600
|
|
Subject: [PATCH] Fix expected test output now that command_timeout is parsed
|
|
correctly in LDIF.
|
|
|
|
---
|
|
.../regress/sudoers/test17.ldif2sudo.ok | 20 +++++++++----------
|
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/plugins/sudoers/regress/sudoers/test17.ldif2sudo.ok b/plugins/sudoers/regress/sudoers/test17.ldif2sudo.ok
|
|
index 6bc2a36ed..608f52fc4 100644
|
|
--- a/plugins/sudoers/regress/sudoers/test17.ldif2sudo.ok
|
|
+++ b/plugins/sudoers/regress/sudoers/test17.ldif2sudo.ok
|
|
@@ -1,29 +1,29 @@
|
|
Defaults command_timeout=2d8h10m59s
|
|
|
|
# sudoRole user0
|
|
-user0 ALL = /usr/bin/id, /usr/bin/who, /bin/ls
|
|
+user0 ALL = TIMEOUT=619830 /usr/bin/id, /usr/bin/who, /bin/ls
|
|
|
|
# sudoRole user1
|
|
-user1 ALL = /usr/bin/id
|
|
+user1 ALL = TIMEOUT=619830 /usr/bin/id
|
|
|
|
# sudoRole user2
|
|
-user2 ALL = /usr/bin/id
|
|
+user2 ALL = TIMEOUT=15030 /usr/bin/id
|
|
|
|
# sudoRole user3
|
|
-user3 ALL = /usr/bin/id
|
|
+user3 ALL = TIMEOUT=630 /usr/bin/id
|
|
|
|
# sudoRole user4
|
|
-user4 ALL = /usr/bin/id
|
|
+user4 ALL = TIMEOUT=1209600 /usr/bin/id
|
|
|
|
# sudoRole user5
|
|
-user5 ALL = /usr/bin/id
|
|
+user5 ALL = TIMEOUT=300 /usr/bin/id
|
|
|
|
# sudoRole user6
|
|
-user6 ALL = /usr/bin/id
|
|
+user6 ALL = TIMEOUT=30 /usr/bin/id
|
|
|
|
# sudoRole user7
|
|
-user7 ALL = /usr/bin/id
|
|
+user7 ALL = TIMEOUT=45 /usr/bin/id
|
|
|
|
# sudoRole user8
|
|
-user8 ALL = /usr/bin/id, /usr/bin/id, /usr/bin/id, /usr/bin/id, /usr/bin/id,\
|
|
- /usr/bin/id
|
|
+user8 ALL = TIMEOUT=619830 /usr/bin/id, /usr/bin/id, /usr/bin/id, /usr/bin/id,\
|
|
+ /usr/bin/id, /usr/bin/id
|
|
--
|
|
2.21.0
|
|
|