Merge branch 'mascguy-gsocket-peerpid' into 'main'

credentials: macos: check for existence of LOCAL_PEERPID

See merge request GNOME/glib!2707
This commit is contained in:
Philip Withnall 2022-06-01 13:11:40 +00:00
commit 164b9894b5

View File

@ -6077,12 +6077,14 @@ g_socket_get_credentials (GSocket *socket,
G_CREDENTIALS_NATIVE_TYPE, G_CREDENTIALS_NATIVE_TYPE,
&cred); &cred);
#ifdef LOCAL_PEERPID
if (getsockopt (socket->priv->fd, if (getsockopt (socket->priv->fd,
SOL_LOCAL, SOL_LOCAL,
LOCAL_PEERPID, LOCAL_PEERPID,
&pid, &pid,
&optlen) == 0) &optlen) == 0)
_g_credentials_set_local_peerid (ret, pid); _g_credentials_set_local_peerid (ret, pid);
#endif
} }
else else
{ {