diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2012-09-07 05:00:59 +0200 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-11 11:57:43 +0000 |
| commit | b417088ff7ef8c346181b279048bcd4b3da338a5 (patch) | |
| tree | 6f3d45fb25f0ab88f5fee5e1b49a5f7df56e448e | |
| parent | c2e2c15455a8dac5f24da05bb7d5902259ca7af9 (diff) | |
| download | dbus-b417088ff7ef8c346181b279048bcd4b3da338a5.tar.gz | |
Windows implementation of GetConnectionCredentials.
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54445
| -rw-r--r-- | bus/driver.c | 20 | ||||
| -rw-r--r-- | doc/dbus-specification.xml | 8 |
2 files changed, 28 insertions, 0 deletions
diff --git a/bus/driver.c b/bus/driver.c index ceebb6f2..83040669 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -38,6 +38,7 @@ #include <dbus/dbus-internals.h> #include <dbus/dbus-message.h> #include <dbus/dbus-marshal-recursive.h> +#include <dbus/dbus-marshal-validate.h> #include <string.h> static DBusConnection * @@ -1646,6 +1647,7 @@ bus_driver_handle_get_connection_credentials (DBusConnection *connection, DBusMessageIter reply_iter; DBusMessageIter array_iter; unsigned long ulong_val; + char *windows_sid; const char *service; _DBUS_ASSERT_ERROR_IS_CLEAR (error); @@ -1680,6 +1682,24 @@ bus_driver_handle_get_connection_credentials (DBusConnection *connection, goto oom; } + if (dbus_connection_get_windows_user (conn, &windows_sid)) + { + DBusString str; + dbus_bool_t result; + _dbus_string_init_const (&str, windows_sid); + result = _dbus_validate_utf8 (&str, 0, _dbus_string_get_length (&str)); + _dbus_string_free (&str); + if (result) + { + if (!_dbus_asv_add_string (&array_iter, "WindowsSID", windows_sid)) + { + dbus_free(windows_sid); + goto oom; + } + } + dbus_free(windows_sid); + } + if (!_dbus_asv_close (&reply_iter, &array_iter)) goto oom; diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index 2f9fef8b..a9a8c591 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -6005,6 +6005,14 @@ this concept. On Unix, this is the process ID defined by POSIX.</entry> </row> + <row> + <entry>WindowsSID</entry> + <entry>STRING</entry> + <entry>The Windows security identifier in its string form, + e.g. "S-1-5-21-3623811015-3361044348-30300820-1013" for + a domain or local computer user or "S-1-5-18" for the + LOCAL_SYSTEM user</entry> + </row> </tbody> </tgroup> </informaltable> |