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

Merge branch 'wip/smcv/gdbus-127001' into 'master'

Browse Source 
gdbus-peer: Specifically listen on 127.0.0.1

Closes #1912

See merge request GNOME/glib!1212
This commit is contained in:
Philip Withnall 2019-11-04 14:02:41 +00:00
commit 6d8836515c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/tests/gdbus-peer.c
View File

@ -278,7 +278,7 @@ setup_test_address (void)
tmp_address = g_strdup_printf ("unix:dir=%s", tmpdir); tmp_address = g_strdup_printf ("unix:dir=%s", tmpdir);
} }
else else
tmp_address = g_strdup ("nonce-tcp:"); tmp_address = g_strdup ("nonce-tcp:host=127.0.0.1");
} }
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
@ -726,7 +726,7 @@ do_test_peer (void)
c = g_dbus_connection_new_for_address_sync (is_unix ? "unix:path=/tmp/gdbus-test-does-not-exist-pid" : c = g_dbus_connection_new_for_address_sync (is_unix ? "unix:path=/tmp/gdbus-test-does-not-exist-pid" :
/* NOTE: Even if something is listening on port 12345 the connection /* NOTE: Even if something is listening on port 12345 the connection
* will fail because the nonce file doesn't exist */ * will fail because the nonce file doesn't exist */
"nonce-tcp:host=localhost,port=12345,noncefile=this-does-not-exist-gdbus", "nonce-tcp:host=127.0.0.1,port=12345,noncefile=this-does-not-exist-gdbus",
G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT, G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT,
NULL, /* GDBusAuthObserver */ NULL, /* GDBusAuthObserver */
NULL, /* cancellable */ NULL, /* cancellable */
@ -1375,7 +1375,7 @@ nonce_tcp_service_thread_func (gpointer user_data)
error = NULL; error = NULL;
observer = g_dbus_auth_observer_new (); observer = g_dbus_auth_observer_new ();
server = g_dbus_server_new_sync ("nonce-tcp:", server = g_dbus_server_new_sync ("nonce-tcp:host=127.0.0.1",
G_DBUS_SERVER_FLAGS_NONE, G_DBUS_SERVER_FLAGS_NONE,
test_guid, test_guid,
observer, observer,
@ -1584,7 +1584,7 @@ tcp_anonymous_service_thread_func (gpointer user_data)
g_main_context_push_thread_default (service_context); g_main_context_push_thread_default (service_context);
error = NULL; error = NULL;
server = g_dbus_server_new_sync ("tcp:", server = g_dbus_server_new_sync ("tcp:host=127.0.0.1",
G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS, G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS,
test_guid, test_guid,
NULL, /* GDBusObserver* */ NULL, /* GDBusObserver* */