luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 23:43:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/pwithnall/dbus-system-bus-address' into 'main'

Browse Source 
gdbusaddress: Use runstatedir rather than localstatedir

See merge request GNOME/glib!3101
This commit is contained in:
Marco Trevisan
2022-12-06 00:24:17 +00:00
parent f4c9b42084 7b9dcb70c4
commit 6599cf95ae
5 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gdbusaddress.c
View File

@@ -1339,8 +1339,10 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type,
{
/* While the D-Bus specification says this must be `/var/run/dbus/system_bus_socket`,
* a footnote allows it to use localstatedir:
* https://dbus.freedesktop.org/doc/dbus-specification.html#ftn.id-1.13.6.4.3.3 */
ret = g_strdup ("unix:path=" GLIB_LOCALSTATEDIR "/run/dbus/system_bus_socket");
* https://dbus.freedesktop.org/doc/dbus-specification.html#ftn.id-1.13.6.4.3.3
* or, on systems where /run is the same as /var/run, runstatedir:
* https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/209 */
ret = g_strdup ("unix:path=" GLIB_RUNSTATEDIR "/dbus/system_bus_socket");
}
break;

2
gio/gunixmounts.c
View File

@@ -266,10 +266,12 @@ g_unix_is_mount_path_system_internal (const char *mount_path)
"/var",
"/var/crash",
"/var/local",
GLIB_LOCALSTATEDIR,
"/var/log",
"/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
"/var/mail",
"/var/run",
GLIB_RUNSTATEDIR,
"/var/tmp", /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
"/proc",
"/sbin",