isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify the check for when we can reuse the previous user and host specs.

Browse Source 
This makes the code easier to read and quiets a cppcheck false positive.
This commit is contained in:
Todd C. Miller
2022-06-01 14:30:47 -06:00
parent 77a47affb4
commit eb0135a93a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/sudoers/parse_ldif.c
View File

@@ -498,11 +498,12 @@ ldif_to_sudoers(struct sudoers_parse_tree *parse_tree,
bool reuse_userspec = false; bool reuse_userspec = false;
bool reuse_privilege = false; bool reuse_privilege = false;
bool reuse_runas = false; bool reuse_runas = false;
struct sudo_role *prev_role = role;
role = role_array[n]; role = role_array[n];
/* Check whether we can reuse the previous user and host specs */ /* Check whether we can reuse the previous user and host specs */
if (n > 0 && role->users == role_array[n - 1]->users) { if (prev_role != NULL && role->users == prev_role->users) {
reuse_userspec = true; reuse_userspec = true;
/* /*
@@ -511,12 +512,12 @@ ldif_to_sudoers(struct sudoers_parse_tree *parse_tree,
* we are storing options. * we are storing options.
*/ */
if (!store_options) { if (!store_options) {
if (role->hosts == role_array[n - 1]->hosts) { if (role->hosts == prev_role->hosts) {
reuse_privilege = true; reuse_privilege = true;
/* Reuse runasusers and runasgroups if possible. */ /* Reuse runasusers and runasgroups if possible. */
if (role->runasusers == role_array[n - 1]->runasusers && if (role->runasusers == prev_role->runasusers &&
role->runasgroups == role_array[n - 1]->runasgroups) role->runasgroups == prev_role->runasgroups)
reuse_runas = true; reuse_runas = true;
} }
} }