diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch index ac8e7f691f..5d3e8d4e84 100644 --- a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch +++ b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e063abdbe73d38302533c02ce5b82116b909b888 Mon Sep 17 00:00:00 2001 | 1 | From 85cf3d58ff1a9696f0754feffae7d81b8d1d9a43 Mon Sep 17 00:00:00 2001 |
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
3 | Date: Fri, 7 Aug 2020 15:20:17 +0000 | 3 | Date: Fri, 7 Aug 2020 15:20:17 +0000 |
4 | Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * | 4 | Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * |
@@ -24,15 +24,15 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
25 | 25 | ||
26 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | 26 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c |
27 | index 04685fecba..90b12bb5bd 100644 | 27 | index 575b9da447..ff08ed23cc 100644 |
28 | --- a/src/nspawn/nspawn.c | 28 | --- a/src/nspawn/nspawn.c |
29 | +++ b/src/nspawn/nspawn.c | 29 | +++ b/src/nspawn/nspawn.c |
30 | @@ -5354,7 +5354,7 @@ static int cant_be_in_netns(void) { | 30 | @@ -5354,7 +5354,7 @@ static int cant_be_in_netns(void) { |
31 | if (fd < 0) | 31 | if (fd < 0) |
32 | return log_error_errno(errno, "Failed to allocate udev control socket: %m"); | 32 | return log_error_errno(errno, "Failed to allocate udev control socket: %m"); |
33 | 33 | ||
34 | - if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { | 34 | - if (connect(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) { |
35 | + if (connect(fd, (struct sockaddr *)&sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { | 35 | + if (connect(fd, (struct sockaddr *)&sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) { |
36 | 36 | ||
37 | if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) | 37 | if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) |
38 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), | 38 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), |