From: Willy Tarreau <w@1wt.eu>
Date: Mon, 25 Nov 2024 07:04:09 +0000 (+0100)
Subject: BUILD: systemd: fix usage of reserved name "sun" in the address field
X-Git-Tag: v3.1.0~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0548302bb258ff22673e6869888bd029dcebda2;p=thirdparty%2Fhaproxy.git

BUILD: systemd: fix usage of reserved name "sun" in the address field

systemd.c doesn't build on Solaris / Illumos because it uses "sun" as
the field name in a structure, while "sun" is the name of the macro
used to detect Solaris:

  src/systemd.c: In function 'sd_notify':
  src/systemd.c:43:22: error: expected identifier or '(' before numeric constant
     struct sockaddr_un sun;
                        ^
  src/systemd.c:44:2: warning: no semicolon at end of struct or union
    } socket_addr = {
    ^

Admittedly, the OS could have instead defined "sun" to itself to avoid
this. Any other name will work, let's just use "ux" for the short form
of "unix".

The problem appeared in 3.0-dev with commit aa3632962f ("MEDIUM:
mworker: get rid of libsystemd"), though by then this file was only
built when USE_SYSTEMD was set, which was not the case for non-linux
platforms. However since 3.1-dev14 with commit 15845247db ("MEDIUM:
mworker: remove USE_SYSTEMD requirement for -Ws"), all platforms
now build this file.

No backport is needed even though it will not hurt to have it in 3.0
for completeness.
---

diff --git a/src/systemd.c b/src/systemd.c
index 64e8e45631..b58117ae46 100644
--- a/src/systemd.c
+++ b/src/systemd.c
@@ -39,9 +39,9 @@ int sd_notify(int unset_environment, const char *message)
 {
 	union sockaddr_union {
 		struct sockaddr sa;
-		struct sockaddr_un sun;
+		struct sockaddr_un ux;
 	} socket_addr = {
-		.sun.sun_family = AF_UNIX,
+		.ux.sun_family = AF_UNIX,
 	};
 	int ret = 1;
 	int fd = -1;
@@ -77,16 +77,16 @@ int sd_notify(int unset_environment, const char *message)
 
 	path_length = strlen(socket_path);
 	/* Ensure there is room for NUL byte */
-	if (path_length >= sizeof(socket_addr.sun.sun_path)) {
+	if (path_length >= sizeof(socket_addr.ux.sun_path)) {
 		ret = -E2BIG;
 		goto end;
 	}
 
-	memcpy(socket_addr.sun.sun_path, socket_path, path_length);
+	memcpy(socket_addr.ux.sun_path, socket_path, path_length);
 
 	/* Support for abstract socket */
-	if (socket_addr.sun.sun_path[0] == '@')
-		socket_addr.sun.sun_path[0] = 0;
+	if (socket_addr.ux.sun_path[0] == '@')
+		socket_addr.ux.sun_path[0] = 0;
 
 	fd = socket(AF_UNIX, SOCK_DGRAM, 0);
 	if (fd < 0) {