luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 23:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbus: Rename a variable to be less misleading

Browse Source 
We're using "setuid" here as shorthand for any elevated privileges
that should make us distrust the caller: setuid, setgid, filesystem
capabilities, more obscure Linux things that set the AT_SECURE flag
(such as certain AppArmor transitions), and their equivalents on
other operating systems. This is fine if we do it consistently, but
I'm about to add a check for whether we are *literally* setuid,
which would be particularly confusing without a rename.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2021-02-02 20:38:41 +00:00
parent 7c0b9c776f
commit 6436d52a0a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gdbusaddress.c
View File

@ -1286,7 +1286,7 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean is_setuid = GLIB_PRIVATE_CALL (g_check_setuid) (); gboolean has_elevated_privileges = GLIB_PRIVATE_CALL (g_check_setuid) ();
gchar *ret, *s = NULL; gchar *ret, *s = NULL;
const gchar *starter_bus; const gchar *starter_bus;
GError *local_error; GError *local_error;
@ -1330,7 +1330,7 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type,
switch (bus_type) switch (bus_type)
{ {
case G_BUS_TYPE_SYSTEM: case G_BUS_TYPE_SYSTEM:
if (is_setuid) if (has_elevated_privileges)
ret = NULL; ret = NULL;
else else
ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS")); ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
@ -1342,7 +1342,7 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type,
break; break;
case G_BUS_TYPE_SESSION: case G_BUS_TYPE_SESSION:
if (is_setuid) if (has_elevated_privileges)
ret = NULL; ret = NULL;
else else
ret = g_strdup (g_getenv ("DBUS_SESSION_BUS_ADDRESS")); ret = g_strdup (g_getenv ("DBUS_SESSION_BUS_ADDRESS"));