diff options
author | Simon McVittie <smcv@collabora.com> | 2018-01-12 16:06:22 +0000 |
---|---|---|
committer | Simon McVittie <smcv@collabora.com> | 2018-01-15 14:04:30 +0000 |
commit | a2932ccc01814e70a7cb66a1090f915d715aa24d (patch) | |
tree | 8ea6c77b74d7969d8c6260cd3dbe223239a34766 /dbus/dbus-sysdeps-win.c | |
parent | 5634b2fec2b54212c1df15a14cb4ec64b59cc100 (diff) | |
download | dbus-a2932ccc01814e70a7cb66a1090f915d715aa24d.tar.gz |
_dbus_credentials_add_from_user: Add proper error reporting
While I'm changing its signature anyway, I might as well fix a
long-standing FIXME.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104588
Diffstat (limited to 'dbus/dbus-sysdeps-win.c')
-rw-r--r-- | dbus/dbus-sysdeps-win.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 90a55a7c..4ad87edc 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -2064,11 +2064,18 @@ _dbus_concat_dir_and_file (DBusString *dir, * @returns #TRUE if the username existed and we got some credentials */ dbus_bool_t -_dbus_credentials_add_from_user (DBusCredentials *credentials, - const DBusString *username) +_dbus_credentials_add_from_user (DBusCredentials *credentials, + const DBusString *username, + DBusError *error) { - return _dbus_credentials_add_windows_sid (credentials, - _dbus_string_get_const_data(username)); + if (!_dbus_credentials_add_windows_sid (credentials, + _dbus_string_get_const_data (username))) + { + _DBUS_SET_OOM (error); + return FALSE; + } + + return TRUE; } /** |