Commit 47148c6b authored by Simon McVittie's avatar Simon McVittie

Merge branch 'auth-idempotent' into 'master'

auth: Clear GUID from server if out of memory

See merge request !119
parents 379eb3a2 0cc191f8
Pipeline #46371 passed with stage
in 11 minutes and 13 seconds
......@@ -1664,10 +1664,25 @@ process_ok(DBusAuth *auth,
_dbus_string_get_const_data (& DBUS_AUTH_CLIENT (auth)->guid_from_server));
if (auth->unix_fd_possible)
return send_negotiate_unix_fd(auth);
{
if (!send_negotiate_unix_fd (auth))
{
_dbus_string_set_length (& DBUS_AUTH_CLIENT (auth)->guid_from_server, 0);
return FALSE;
}
return TRUE;
}
_dbus_verbose("Not negotiating unix fd passing, since not possible\n");
return send_begin (auth);
if (!send_begin (auth))
{
_dbus_string_set_length (& DBUS_AUTH_CLIENT (auth)->guid_from_server, 0);
return FALSE;
}
return TRUE;
}
static dbus_bool_t
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment