From d81f3ec21ce46e6e0423002e3fbf83619f6bc8d3 Mon Sep 17 00:00:00 2001
From: Andreas Hasenack <andreas@canonical.com>
Date: Fri, 15 Mar 2019 21:48:18 -0300
Subject: [PATCH] Problem: test_filter_with_supplemental_process_owner_gid
 fails

Solution: only set supgroup to a valid gid
---
 tests/test_filter_ipc.cpp | 6 ++++--
 tests/testutil.hpp        | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/test_filter_ipc.cpp b/tests/test_filter_ipc.cpp
index 60827a26..5d9fe81a 100644
--- a/tests/test_filter_ipc.cpp
+++ b/tests/test_filter_ipc.cpp
@@ -122,8 +122,10 @@ void init_groups ()
     supgroup = group;
     notgroup = group + 1;
     for (int i = 0; i < ngroups; i++) {
-        if (supgroup == group && group != groups[i])
-            supgroup = groups[i];
+        if (supgroup == group && group != groups[i]) {
+            if (getgrgid (groups[i]))
+                supgroup = groups[i];
+        }
         if (notgroup <= groups[i])
             notgroup = groups[i] + 1;
     }
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
index 69b7fe54..b0f0d77f 100644
--- a/tests/testutil.hpp
+++ b/tests/testutil.hpp
@@ -78,8 +78,10 @@
 #include <unistd.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <grp.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/if.h>