466bbb73bf
This isn't a long-term / upstreamable fix but it will at least let rpm-ostree work in F38/Rawhide for now while we work out a proper fix.
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 74bf5dc0985f3e1f90db322a8119f451ecdc52c4 Mon Sep 17 00:00:00 2001
|
|
From: Adam Williamson <awilliam@redhat.com>
|
|
Date: Tue, 14 Feb 2023 16:52:49 -0800
|
|
Subject: [PATCH 2/2] Revert "gio/gdbusserver: use non-abstract socket for
|
|
unix:tmpdir="
|
|
|
|
This reverts commit c0a1a3b384a27b4b18628174a5c4d9f3fb0a8c82.
|
|
---
|
|
gio/gdbusserver.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
|
|
index db0c9ab50..f144d129a 100644
|
|
--- a/gio/gdbusserver.c
|
|
+++ b/gio/gdbusserver.c
|
|
@@ -725,7 +725,14 @@ try_unix (GDBusServer *server,
|
|
for (n = 0; n < 8; n++)
|
|
g_string_append_c (s, random_ascii ());
|
|
|
|
- address = g_unix_socket_address_new (s->str);
|
|
+ /* prefer abstract namespace if available for tmpdir: addresses
|
|
+ * abstract namespace is disallowed for dir: addresses */
|
|
+ if (tmpdir != NULL && g_unix_socket_address_abstract_names_supported ())
|
|
+ address = g_unix_socket_address_new_with_type (s->str,
|
|
+ -1,
|
|
+ G_UNIX_SOCKET_ADDRESS_ABSTRACT);
|
|
+ else
|
|
+ address = g_unix_socket_address_new (s->str);
|
|
g_string_free (s, TRUE);
|
|
|
|
local_error = NULL;
|
|
--
|
|
2.39.1
|
|
|