diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2005-07-17 19:36:24 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2005-07-17 19:36:24 +0000 |
| commit | b91870497d8303baf4c3fd0b8e7f90de44b753e1 (patch) | |
| tree | 517b6cfdc938d24310f92d6783b03bfc955ad01b /bus/driver.c | |
| parent | 8f854c99d85ea2df9f5e2be100a97ba2466bf988 (diff) | |
* NEWS: Updated to 0.35.2
* python/_dbus.py: Remove import of the dbus.services
module as it no longer exists (patch from Dimitur Kirov)
* python/service.py (Object::__init__): Fixed typo
s/name/bus_name (patch from Dimitur Kirov)
* python/examples/example-signal-emitter.py: import dbus.glib
to get the main loop and use glib mainloop instead of gtk so
X doesn't have to be running.
* python/examples/example-signal-recipient.py: import dbus.glib
to get the main loop and use glib mainloop instead of gtk so
X doesn't have to be running. Import the decorators module
directly.
* test/glib/Makefile.am: Added DIST_EXTRA files that distcheck
didn't pick up on but are needed to build
* configure.in: upped version to 0.35.2
* bus/driver.c, bus/selinux.c, bus/selinux.h, dbus/dbus-protocol.h:
added Colin Walters' SELinux API rename patch from head
s/unix sercurity context/selinux security context/
Diffstat (limited to 'bus/driver.c')
| -rw-r--r-- | bus/driver.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bus/driver.c b/bus/driver.c index 8e8a5366..da4edaa7 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -1015,10 +1015,10 @@ bus_driver_handle_get_connection_unix_process_id (DBusConnection *connection, } static dbus_bool_t -bus_driver_handle_get_connection_unix_security_context (DBusConnection *connection, - BusTransaction *transaction, - DBusMessage *message, - DBusError *error) +bus_driver_handle_get_connection_selinux_security_context (DBusConnection *connection, + BusTransaction *transaction, + DBusMessage *message, + DBusError *error) { const char *service; DBusString str; @@ -1062,13 +1062,13 @@ bus_driver_handle_get_connection_unix_security_context (DBusConnection *connecti if (!context) { dbus_set_error (error, - DBUS_ERROR_UNIX_SECURITY_CONTEXT_UNKNOWN, + DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, "Could not determine security context for '%s'", service); goto failed; } - if (! bus_selinux_append_context (reply, context)) - goto oom; + if (! bus_selinux_append_context (reply, context, error)) + goto failed; if (! bus_transaction_send_from_driver (transaction, connection, reply)) goto oom; @@ -1167,10 +1167,10 @@ struct DBUS_TYPE_STRING_AS_STRING, DBUS_TYPE_UINT32_AS_STRING, bus_driver_handle_get_connection_unix_process_id }, - { "GetConnectionUnixSecurityContext", - DBUS_TYPE_STRING_AS_STRING, + { "GetConnectionSELinuxSecurityContext", DBUS_TYPE_STRING_AS_STRING, - bus_driver_handle_get_connection_unix_security_context }, + DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING, + bus_driver_handle_get_connection_selinux_security_context }, { "ReloadConfig", "", "", |