luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-25 03:17:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'win32-fd' into 'main'

Browse Source 
gio: various unix/fd-related enablement on win32

See merge request GNOME/glib!2656
This commit is contained in:
Philip Withnall
2022-05-18 14:01:43 +00:00
parent 0be6aa1b22 bb890b57d2
commit caf6d99fbe
10 changed files with 224 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gdbusauth.c
View File

@@ -39,11 +39,9 @@
#include "gdatainputstream.h"
#include "gdataoutputstream.h"
#ifdef G_OS_UNIX
#include "gnetworking.h"
#include "gunixconnection.h"
#include "gunixcredentialsmessage.h"
#endif
#include "glibintl.h"
@@ -974,7 +972,6 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
g_data_input_stream_set_newline_type (dis, G_DATA_STREAM_NEWLINE_TYPE_CR_LF);
/* read the NUL-byte, possibly with credentials attached */
#ifdef G_OS_UNIX
#ifndef G_CREDENTIALS_PREFER_MESSAGE_PASSING
if (G_IS_SOCKET_CONNECTION (auth->priv->stream))
{
@@ -1020,15 +1017,7 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
goto out;
}
}
#else
local_error = NULL;
(void)g_data_input_stream_read_byte (dis, cancellable, &local_error);
if (local_error != NULL)
{
g_propagate_error (error, local_error);
goto out;
}
#endif
if (credentials != NULL)
{
if (G_UNLIKELY (_g_dbus_debug_authentication ()))