From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 25 Aug 2018 05:24:37 +0000 (+0200)
Subject: macro: add LXC_AUDS_ADDR_LEN
X-Git-Tag: lxc-3.1.0~127^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1234129fba58edb85d85dd92c66a4b17c6c4bd8;p=thirdparty%2Flxc.git

macro: add LXC_AUDS_ADDR_LEN

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

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 30d6b6047..0eeb1b5be 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -1234,7 +1234,7 @@ out_close:
 int lxc_cmd_init(const char *name, const char *lxcpath, const char *suffix)
 {
 	int fd, len, ret;
-	char path[sizeof(((struct sockaddr_un *)0)->sun_path)] = {0};
+	char path[LXC_AUDS_ADDR_LEN] = {0};
 	char *offset = &path[1];
 
 	/* -2 here because this is an abstract unix socket so it needs a
diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
index 854d90ce5..c6544631d 100644
--- a/src/lxc/commands_utils.c
+++ b/src/lxc/commands_utils.c
@@ -162,7 +162,7 @@ int lxc_cmd_connect(const char *name, const char *lxcpath,
 		    const char *hashed_sock_name, const char *suffix)
 {
 	int ret, client_fd;
-	char path[sizeof(((struct sockaddr_un *)0)->sun_path)] = {0};
+	char path[LXC_AUDS_ADDR_LEN] = {0};
 	char *offset = &path[1];
 
 	/* -2 here because this is an abstract unix socket so it needs a
diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index d6e871272..aa1d5478c 100644
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
+#include <sys/un.h>
 
 /* Define __S_ISTYPE if missing from the C library. */
 #ifndef __S_ISTYPE
@@ -238,6 +239,9 @@ extern int __build_bug_on_failed;
 #define MACVLAN_MODE_PASSTHRU 8
 #endif
 
+/* Length of abstract unix domain socket socket address. */
+#define LXC_AUDS_ADDR_LEN sizeof(((struct sockaddr_un *)0)->sun_path)
+
 /* mount */
 #ifndef MS_REC
 #define MS_REC 16384