The 'if' clauses that have termination as either of the control flow
results will never need 'else'. Making the termination to happen true
flow is enough.
Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
login-utils/newgrp.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c
index 58c9078..3f5c720 100644
--- a/login-utils/newgrp.c
+++ b/login-utils/newgrp.c
@@ -214,15 +214,12 @@ int main(int argc, char *argv[])
if (errno)
err(EXIT_FAILURE, _("no such group"));
else
- /* No group */
errx(EXIT_FAILURE, _("no such group"));
- } else {
- if (allow_setgid(pw_entry, gr_entry)) {
- if (setgid(gr_entry->gr_gid) < 0)
- err(EXIT_FAILURE, _("setgid failed"));
- } else
- errx(EXIT_FAILURE, _("permission denied"));
}
+ if (!allow_setgid(pw_entry, gr_entry))
+ errx(EXIT_FAILURE, _("permission denied"));
+ if (setgid(gr_entry->gr_gid) < 0)
+ err(EXIT_FAILURE, _("setgid failed"));
}
if (setuid(getuid()) < 0)
--
2.2.1
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
