luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-13 06:00:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio: remove pointless use of g_unix_socket_address_abstract_names_supported with unix:tmpdir=

Browse Source 
There's no point in checking for
g_unix_socket_address_abstract_names_supported now that unix:tmpdir=
always use non-abstract sockets.
This commit is contained in:
msizanoen1 2022-10-21 21:57:28 +07:00
parent c0a1a3b384
commit 9151fe94cb
4 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gdbusdaemon.c
View File

@ -1618,13 +1618,8 @@ initable_init (GInitable *initable,
if (daemon->address == NULL) if (daemon->address == NULL)
{ {
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
if (g_unix_socket_address_abstract_names_supported ())
daemon->address = g_strdup ("unix:tmpdir=/tmp/gdbus-daemon");
else
{
daemon->tmpdir = g_dir_make_tmp ("gdbus-daemon-XXXXXX", NULL); daemon->tmpdir = g_dir_make_tmp ("gdbus-daemon-XXXXXX", NULL);
daemon->address = g_strdup_printf ("unix:tmpdir=%s", daemon->tmpdir); daemon->address = g_strdup_printf ("unix:tmpdir=%s", daemon->tmpdir);
}
flags |= G_DBUS_SERVER_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER; flags |= G_DBUS_SERVER_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER;
#else #else
/* Don’t require authentication on Windows as that hasn’t been /* Don’t require authentication on Windows as that hasn’t been

7
gio/tests/gdbus-auth.c
View File

@ -63,17 +63,10 @@ server_new_for_mechanism (const gchar *allowed_mechanism)
guid = g_dbus_generate_guid (); guid = g_dbus_generate_guid ();
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
if (g_unix_socket_address_abstract_names_supported ())
{
addr = g_strdup ("unix:tmpdir=/tmp/gdbus-test-");
}
else
{
gchar *tmpdir; gchar *tmpdir;
tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL); tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL);
addr = g_strdup_printf ("unix:tmpdir=%s", tmpdir); addr = g_strdup_printf ("unix:tmpdir=%s", tmpdir);
g_free (tmpdir); g_free (tmpdir);
}
#else #else
addr = g_strdup ("nonce-tcp:"); addr = g_strdup ("nonce-tcp:");
#endif #endif

5
gio/tests/gdbus-overflow.c
View File

@ -218,15 +218,10 @@ main (int argc,
test_guid = g_dbus_generate_guid (); test_guid = g_dbus_generate_guid ();
if (is_unix) if (is_unix)
{
if (g_unix_socket_address_abstract_names_supported ())
tmp_address = g_strdup ("unix:tmpdir=/tmp/gdbus-test-");
else
{ {
tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL); tmpdir = g_dir_make_tmp ("gdbus-test-XXXXXX", NULL);
tmp_address = g_strdup_printf ("unix:tmpdir=%s", tmpdir); tmp_address = g_strdup_printf ("unix:tmpdir=%s", tmpdir);
} }
}
else else
tmp_address = g_strdup ("nonce-tcp:"); tmp_address = g_strdup ("nonce-tcp:");

5
gio/tests/gmenumodel.c
View File

@ -831,13 +831,8 @@ service_thread_func (gpointer user_data)
flags = G_DBUS_SERVER_FLAGS_NONE; flags = G_DBUS_SERVER_FLAGS_NONE;
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
if (g_unix_socket_address_abstract_names_supported ())
address = g_strdup ("unix:tmpdir=/tmp/test-dbus-peer");
else
{
tmpdir = g_dir_make_tmp ("test-dbus-peer-XXXXXX", NULL); tmpdir = g_dir_make_tmp ("test-dbus-peer-XXXXXX", NULL);
address = g_strdup_printf ("unix:tmpdir=%s", tmpdir); address = g_strdup_printf ("unix:tmpdir=%s", tmpdir);
}
#else #else
address = g_strdup ("nonce-tcp:"); address = g_strdup ("nonce-tcp:");
flags |= G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS; flags |= G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS;