From e1ea3c13118134b0404a4f54a47e813794531b8d Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 23 Jul 2012 12:40:52 +0000 Subject: [PATCH] Merge two if conditions in main() --- jcc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/jcc.c b/jcc.c index f2fa2cfc..0aea9644 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.379 2012/07/23 12:39:12 fabiankeil Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.380 2012/07/23 12:39:42 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -3198,12 +3198,9 @@ int main(int argc, char **argv) { log_error(LOG_LEVEL_FATAL, "Cannot setgid(): Insufficient permissions."); } - if (NULL != grp) + if ((NULL != grp) && setgroups(1, &grp->gr_gid)) { - if (setgroups(1, &grp->gr_gid)) - { - log_error(LOG_LEVEL_FATAL, "setgroups() failed: %E"); - } + log_error(LOG_LEVEL_FATAL, "setgroups() failed: %E"); } else if (initgroups(pw->pw_name, pw->pw_gid)) { -- 2.39.2