Merge branch 'master' of ssh://github.com/netblue30/firejail

1 files changed, 9 insertions, 3 deletions

diff --git a/src/firejail/util.c b/src/firejail/util.c
index 109105630..eb7f05624 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -173,13 +173,19 @@ static void clean_supplementary_groups(gid_t gid) {
         assert(cfg.username);
         gid_t groups[MAX_GROUPS];
         int ngroups = MAX_GROUPS;
+
+        if (arg_nogroups && check_can_drop_all_groups()) {
+                if (setgroups(0, NULL) < 0)
+                        errExit("setgroups");
+                if (arg_debug)
+                        printf("No supplementary groups\n");
+                return;
+        }
+
         int rv = getgrouplist(cfg.username, gid, groups, &ngroups);
         if (rv == -1)
                 goto clean_all;
 
-        if (arg_nogroups && check_can_drop_all_groups())
-                goto clean_all;
-
         // clean supplementary group list
         gid_t new_groups[MAX_GROUPS];
         int new_ngroups = 0;