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

Remove an unneeded NULL check to quiet a cppcheck warning.

Browse Source
This commit is contained in:
Todd C. Miller
2014-10-22 10:41:23 -06:00
parent 15f5af06d7
commit f71d4abd7b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/sudoers/parse.c
View File

@@ -340,8 +340,7 @@ sudo_file_append_cmnd(struct cmndspec *cs, struct cmndtag *tags,
} }
#define RUNAS_CHANGED(cs1, cs2) \ #define RUNAS_CHANGED(cs1, cs2) \
(cs1 == NULL || cs2 == NULL || \ (cs1->runasuserlist != cs2->runasuserlist || \
cs1->runasuserlist != cs2->runasuserlist || \
cs1->runasgrouplist != cs2->runasgrouplist) cs1->runasgrouplist != cs2->runasgrouplist)
static int static int
@@ -366,7 +365,7 @@ sudo_file_display_priv_short(struct passwd *pw, struct userspec *us,
continue; continue;
prev_cs = NULL; prev_cs = NULL;
TAILQ_FOREACH(cs, &priv->cmndlist, entries) { TAILQ_FOREACH(cs, &priv->cmndlist, entries) {
if (RUNAS_CHANGED(cs, prev_cs)) { if (prev_cs == NULL || RUNAS_CHANGED(cs, prev_cs)) {
if (cs != TAILQ_FIRST(&priv->cmndlist)) if (cs != TAILQ_FIRST(&priv->cmndlist))
sudo_lbuf_append(lbuf, "\n"); sudo_lbuf_append(lbuf, "\n");
sudo_lbuf_append(lbuf, " ("); sudo_lbuf_append(lbuf, " (");