From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 5 Feb 2021 10:05:58 +0000 (+0100)
Subject: conf: use lxc_groups_t directly
X-Git-Tag: lxc-5.0.0~299^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4822319f3182dd2e136be85e0147f97c52c66f8a;p=thirdparty%2Flxc.git

conf: use lxc_groups_t directly

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 4d13e90dc..9dae088e6 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -15,6 +15,7 @@
 #include <sys/types.h>
 #include <sys/vfs.h>
 
+#include "attach_options.h"
 #include "caps.h"
 #include "compiler.h"
 #include "config.h"
@@ -413,14 +414,12 @@ struct lxc_conf {
 	/* init command */
 	char *init_cmd;
 
-	/* if running in a new user namespace, the UID/GID that init and COMMAND
-	 * should run under when using lxc-execute */
+	/* The uid to use for the container. */
 	uid_t init_uid;
+	/* The gid to use for the container. */
 	gid_t init_gid;
-	struct {
-		int size;
-		gid_t *list;
-	} init_groups;
+	/* The groups to use for the container. */
+	lxc_groups_t init_groups;
 
 	/* indicator if the container will be destroyed on shutdown */
 	unsigned int ephemeral;