30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From 2ffcda8e15afe312550be4017d8c40dbb438b786 Mon Sep 17 00:00:00 2001
|
|
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
|
|
Date: Thu, 2 Nov 2023 14:42:42 -0600
|
|
Subject: [PATCH] role_to_sudoers: only try to reuse a privilege if one is
|
|
present
|
|
|
|
Reference:https://github.com/sudo-project/sudo/commit/2ffcda8e15afe312550be4017d8c40dbb438b786
|
|
Conflict:NA
|
|
|
|
---
|
|
plugins/sudoers/parse_ldif.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/plugins/sudoers/parse_ldif.c b/plugins/sudoers/parse_ldif.c
|
|
index 87c94125c..180e7da6c 100644
|
|
--- a/plugins/sudoers/parse_ldif.c
|
|
+++ b/plugins/sudoers/parse_ldif.c
|
|
@@ -427,7 +427,7 @@ role_to_sudoers(struct sudoers_parse_tree *parse_tree, struct sudo_role *role,
|
|
U_("unable to allocate memory"));
|
|
}
|
|
|
|
- if (reuse_privilege) {
|
|
+ if (reuse_privilege && !TAILQ_EMPTY(&us->privileges)) {
|
|
/* Hostspec unchanged, append cmndlist to previous privilege. */
|
|
struct privilege *prev_priv = TAILQ_LAST(&us->privileges, privilege_list);
|
|
if (reuse_runas) {
|
|
--
|
|
2.33.0
|
|
|