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

Move the allocation of role to be immediately before in_role is set.

Browse Source 
This makes it clear that when in_role == true, role is non-NULL.
Also remove two dead stores.
This commit is contained in:
Todd C. Miller
2018-10-18 14:43:08 -06:00
parent 2ff8f8601b
commit 84ef500061
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/sudoers/parse_ldif.c
View File

@@ -573,14 +573,12 @@ sudoers_parse_ldif(struct sudoers_parse_tree *parse_tree,
if (role->cn != NULL && strcmp(role->cn, "defaults") == 0) { if (role->cn != NULL && strcmp(role->cn, "defaults") == 0) {
ldif_store_options(parse_tree, role->options); ldif_store_options(parse_tree, role->options);
sudo_role_free(role); sudo_role_free(role);
role = NULL;
} else if (STAILQ_EMPTY(role->users) || } else if (STAILQ_EMPTY(role->users) ||
STAILQ_EMPTY(role->hosts) || STAILQ_EMPTY(role->cmnds)) { STAILQ_EMPTY(role->hosts) || STAILQ_EMPTY(role->cmnds)) {
/* Incomplete role. */ /* Incomplete role. */
sudo_warnx(U_("ignoring incomplete sudoRole: cn: %s"), sudo_warnx(U_("ignoring incomplete sudoRole: cn: %s"),
role->cn ? role->cn : "UNKNOWN"); role->cn ? role->cn : "UNKNOWN");
sudo_role_free(role); sudo_role_free(role);
role = NULL;
} else { } else {
/* Cache users, hosts, runasusers and runasgroups. */ /* Cache users, hosts, runasusers and runasgroups. */
if (str_list_cache(usercache, &role->users) == -1 || if (str_list_cache(usercache, &role->users) == -1 ||
@@ -638,14 +636,6 @@ sudoers_parse_ldif(struct sudoers_parse_tree *parse_tree,
ungetc(ch, fp); ungetc(ch, fp);
} }
/* Allocate new role as needed. */
if (role == NULL) {
if ((role = sudo_role_alloc()) == NULL) {
sudo_fatalx(U_("%s: %s"), __func__,
U_("unable to allocate memory"));
}
}
/* Parse dn and objectClass. */ /* Parse dn and objectClass. */
if (strncasecmp(line, "dn:", 3) == 0) { if (strncasecmp(line, "dn:", 3) == 0) {
/* Compare dn to base, if specified. */ /* Compare dn to base, if specified. */
@@ -676,8 +666,16 @@ sudoers_parse_ldif(struct sudoers_parse_tree *parse_tree,
} }
} else if (strncmp(line, "objectClass:", 12) == 0) { } else if (strncmp(line, "objectClass:", 12) == 0) {
attr = ldif_parse_attribute(line + 12); attr = ldif_parse_attribute(line + 12);
if (attr != NULL && strcmp(attr, "sudoRole") == 0) if (attr != NULL && strcmp(attr, "sudoRole") == 0) {
/* Allocate new role as needed. */
if (role == NULL) {
if ((role = sudo_role_alloc()) == NULL) {
sudo_fatalx(U_("%s: %s"), __func__,
U_("unable to allocate memory"));
}
}
in_role = true; in_role = true;
}
} }
/* Not in a sudoRole, keep reading. */ /* Not in a sudoRole, keep reading. */