chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: rename KDBUS_CMD_FNAME_POLICY_NONE -> KDBUS_CMD_FNAME_POLICY_OPEN
[elogind.git]
/
src
/
core
/
dbus-manager.c
diff --git
a/src/core/dbus-manager.c
b/src/core/dbus-manager.c
index de23369397ff73cd182af317baee36c569ded982..c23709c2b618f7f32ba0d5ead8fe8cbd7ccff91a 100644
(file)
--- a/
src/core/dbus-manager.c
+++ b/
src/core/dbus-manager.c
@@
-103,30
+103,31
@@
" <method name=\"ResetFailedUnit\">\n" \
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
" </method>\n" \
" <method name=\"ResetFailedUnit\">\n" \
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
" </method>\n" \
- " <method name=\"
GetUnitControlGroupAttributes\">\n"
\
+ " <method name=\"
SetUnitControlGroup\">\n"
\
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"
attributes\" type=\"as\" direction=\"in\"/>\n"
\
- " <arg name=\"
values\" type=\"as\" direction=\"out\"/>\n"
\
+ " <arg name=\"
group\" type=\"s\" direction=\"in\"/>\n"
\
+ " <arg name=\"
mode\" type=\"s\" direction=\"in\"/>\n"
\
" </method>\n" \
" </method>\n" \
- " <method name=\"
SetUnitControlGroupAttributes\">\n"
\
+ " <method name=\"
UnsetUnitControlGroup\">\n"
\
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"
attributes\" type=\"a(sss)\" direction=\"in\"/>\n"
\
+ " <arg name=\"
group\" type=\"s\" direction=\"in\"/>\n"
\
" <arg name=\"mode\" type=\"s\" direction=\"in\"\n/>" \
" </method>\n" \
" <arg name=\"mode\" type=\"s\" direction=\"in\"\n/>" \
" </method>\n" \
- " <method name=\"
UnsetUnitControlGroupAttributes\">\n"
\
+ " <method name=\"
GetUnitControlGroupAttribute\">\n"
\
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"attribute
s\" type=\"a(ss)\" direction=\"in\"/>\n"
\
- " <arg name=\"
mode\" type=\"s\" direction=\"in\"/>\n"
\
+ " <arg name=\"attribute
\" type=\"s\" direction=\"in\"/>\n"
\
+ " <arg name=\"
values\" type=\"as\" direction=\"out\"/>\n"
\
" </method>\n" \
" </method>\n" \
- " <method name=\"SetUnitControlGroup
s\">\n"
\
+ " <method name=\"SetUnitControlGroup
Attribute\">\n"
\
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"groups\" type=\"as\" direction=\"in\"/>\n" \
- " <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n" \
+ " <arg name=\"attribute\" type=\"s\" direction=\"in\"/>\n" \
+ " <arg name=\"values\" type=\"as\" direction=\"in\"/>\n" \
+ " <arg name=\"mode\" type=\"s\" direction=\"in\"\n/>" \
" </method>\n" \
" </method>\n" \
- " <method name=\"UnsetUnitControlGroup
s\">\n"
\
+ " <method name=\"UnsetUnitControlGroup
Attributes\">\n"
\
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
- " <arg name=\"
groups\" type=\"as\" direction=\"in\"/>\n"
\
- " <arg name=\"mode\" type=\"s\" direction=\"in\"
\n/>
" \
+ " <arg name=\"
attribute\" type=\"s\" direction=\"in\"/>\n"
\
+ " <arg name=\"mode\" type=\"s\" direction=\"in\"
/>\n
" \
" </method>\n" \
" <method name=\"GetJob\">\n" \
" <arg name=\"id\" type=\"u\" direction=\"in\"/>\n" \
" </method>\n" \
" <method name=\"GetJob\">\n" \
" <arg name=\"id\" type=\"u\" direction=\"in\"/>\n" \
@@
-289,8
+290,8
@@
" <property name=\"DefaultControllers\" type=\"as\" access=\"read\"/>\n" \
" <property name=\"DefaultStandardOutput\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"DefaultStandardError\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"DefaultControllers\" type=\"as\" access=\"read\"/>\n" \
" <property name=\"DefaultStandardOutput\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"DefaultStandardError\" type=\"s\" access=\"read\"/>\n" \
- " <property name=\"RuntimeWatchdogUSec\" type=\"
s
\" access=\"readwrite\"/>\n" \
- " <property name=\"ShutdownWatchdogUSec\" type=\"
s
\" access=\"readwrite\"/>\n" \
+ " <property name=\"RuntimeWatchdogUSec\" type=\"
t
\" access=\"readwrite\"/>\n" \
+ " <property name=\"ShutdownWatchdogUSec\" type=\"
t
\" access=\"readwrite\"/>\n" \
" <property name=\"Virtualization\" type=\"s\" access=\"read\"/>\n"
#define BUS_MANAGER_INTERFACE_END \
" <property name=\"Virtualization\" type=\"s\" access=\"read\"/>\n"
#define BUS_MANAGER_INTERFACE_END \
@@
-874,7
+875,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
if (!reply)
goto oom;
if (!reply)
goto oom;
- } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "SetUnitControlGroup
s
")) {
+ } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "SetUnitControlGroup")) {
const char *name;
Unit *u;
DBusMessageIter iter;
const char *name;
Unit *u;
DBusMessageIter iter;
@@
-902,7
+903,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
if (!reply)
goto oom;
if (!reply)
goto oom;
- } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "UnsetUnitControlGroup
s
")) {
+ } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "UnsetUnitControlGroup")) {
const char *name;
Unit *u;
DBusMessageIter iter;
const char *name;
Unit *u;
DBusMessageIter iter;
@@
-930,7
+931,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
if (!reply)
goto oom;
if (!reply)
goto oom;
- } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "SetUnitControlGroupAttribute
s
")) {
+ } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "SetUnitControlGroupAttribute")) {
const char *name;
Unit *u;
DBusMessageIter iter;
const char *name;
Unit *u;
DBusMessageIter iter;
@@
-949,6
+950,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
}
SELINUX_UNIT_ACCESS_CHECK(u, connection, message, "start");
}
SELINUX_UNIT_ACCESS_CHECK(u, connection, message, "start");
+
r = bus_unit_cgroup_attribute_set(u, &iter);
if (r < 0)
return bus_send_error_reply(connection, message, NULL, r);
r = bus_unit_cgroup_attribute_set(u, &iter);
if (r < 0)
return bus_send_error_reply(connection, message, NULL, r);
@@
-957,7
+959,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
if (!reply)
goto oom;
if (!reply)
goto oom;
- } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "UnsetUnitControlGroupAttribute
s
")) {
+ } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "UnsetUnitControlGroupAttribute")) {
const char *name;
Unit *u;
DBusMessageIter iter;
const char *name;
Unit *u;
DBusMessageIter iter;
@@
-985,7
+987,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
if (!reply)
goto oom;
if (!reply)
goto oom;
- } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "GetUnitControlGroupAttribute
s
")) {
+ } else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "GetUnitControlGroupAttribute")) {
const char *name;
Unit *u;
DBusMessageIter iter;
const char *name;
Unit *u;
DBusMessageIter iter;
@@
-1005,6
+1007,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
}
SELINUX_UNIT_ACCESS_CHECK(u, connection, message, "status");
}
SELINUX_UNIT_ACCESS_CHECK(u, connection, message, "status");
+
r = bus_unit_cgroup_attribute_get(u, &iter, &list);
if (r < 0)
return bus_send_error_reply(connection, message, NULL, r);
r = bus_unit_cgroup_attribute_get(u, &iter, &list);
if (r < 0)
return bus_send_error_reply(connection, message, NULL, r);
@@
-1891,7
+1894,7
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
}
if (reply)
}
if (reply)
- if (!
dbus_connection_send(connection, reply, NULL
))
+ if (!
bus_maybe_send_reply(connection, message, reply
))
goto oom;
return DBUS_HANDLER_RESULT_HANDLED;
goto oom;
return DBUS_HANDLER_RESULT_HANDLED;