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

Remove the credentials argument from g_unix_connect_send_credentials()

Browse Source 
Instead, make it always send the current credentials.
This commit is contained in:
Matthias Clasen 2010-05-13 14:25:29 -04:00
parent 33952347ff
commit 9e90b381f5
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gdbusauth.c
View File

@ -612,7 +612,6 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
{ {
credentials = g_credentials_new (); credentials = g_credentials_new ();
if (!g_unix_connection_send_credentials (G_UNIX_CONNECTION (auth->priv->stream), if (!g_unix_connection_send_credentials (G_UNIX_CONNECTION (auth->priv->stream),
credentials,
cancellable, cancellable,
error)) error))
goto out; goto out;
@ -641,7 +640,7 @@ _g_dbus_auth_run_client (GDBusAuth *auth,
debug_print ("CLIENT: didn't send any credentials"); debug_print ("CLIENT: didn't send any credentials");
} }
/* TODO: to reduce rountrips, try to pick an auth mechanism to start with */ /* TODO: to reduce roundtrips, try to pick an auth mechanism to start with */
/* Get list of supported authentication mechanisms */ /* Get list of supported authentication mechanisms */
s = "AUTH\r\n"; s = "AUTH\r\n";

16
gio/gunixconnection.c
View File

@ -299,34 +299,30 @@ gboolean g_unix_connection_create_pair (GUnixCo
/** /**
* g_unix_connection_send_credentials: * g_unix_connection_send_credentials:
* @connection: A #GUnixConnection. * @connection: A #GUnixConnection.
* @credentials: A #GCredentials to send.
* @cancellable: A #GCancellable or %NULL. * @cancellable: A #GCancellable or %NULL.
* @error: Return location for error or %NULL. * @error: Return location for error or %NULL.
* *
* Passes the credentials stored in @credentials to the recieving side * Passes the credentials of the current user the receiving side
* of the connection. The recieving end has to call * of the connection. The recieving end has to call
* g_unix_connection_receive_credentials() (or similar) to accept the * g_unix_connection_receive_credentials() (or similar) to accept the
* credentials. * credentials.
* *
* The credentials which the sender specifies are checked by the
* kernel. A process with effective user ID 0 is allowed to specify
* values that do not match its own. This means that the credentials
* can be used to authenticate other connections.
*
* As well as sending the credentials this also writes a single NUL * As well as sending the credentials this also writes a single NUL
* byte to the stream, as this is required for credentials passing to * byte to the stream, as this is required for credentials passing to
* work on some implementations. * work on some implementations.
* *
* Note that this function only works on Linux, currently.
*
* Returns: %TRUE on success, %FALSE if @error is set. * Returns: %TRUE on success, %FALSE if @error is set.
* *
* Since: 2.26 * Since: 2.26
*/ */
gboolean gboolean
g_unix_connection_send_credentials (GUnixConnection *connection, g_unix_connection_send_credentials (GUnixConnection *connection,
GCredentials *credentials,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GCredentials *credentials;
GSocketControlMessage *scm; GSocketControlMessage *scm;
GSocket *socket; GSocket *socket;
gboolean ret; gboolean ret;
@ -334,11 +330,12 @@ g_unix_connection_send_credentials (GUnixConnection *connection,
guchar nul_byte[1] = {'\0'}; guchar nul_byte[1] = {'\0'};
g_return_val_if_fail (G_IS_UNIX_CONNECTION (connection), FALSE); g_return_val_if_fail (G_IS_UNIX_CONNECTION (connection), FALSE);
g_return_val_if_fail (G_IS_CREDENTIALS (credentials), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
ret = FALSE; ret = FALSE;
credentials = g_credentials_new ();
vector.buffer = &nul_byte; vector.buffer = &nul_byte;
vector.size = 1; vector.size = 1;
scm = g_unix_credentials_message_new_with_credentials (credentials); scm = g_unix_credentials_message_new_with_credentials (credentials);
@ -362,6 +359,7 @@ g_unix_connection_send_credentials (GUnixConnection *connection,
out: out:
g_object_unref (socket); g_object_unref (socket);
g_object_unref (scm); g_object_unref (scm);
g_object_unref (credentials);
return ret; return ret;
} }

1
gio/gunixconnection.h
View File

@ -72,7 +72,6 @@ gint g_unix_connection_receive_fd (GUnixCo
GError **error); GError **error);
gboolean g_unix_connection_send_credentials (GUnixConnection *connection, gboolean g_unix_connection_send_credentials (GUnixConnection *connection,
GCredentials *credentials,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);