From a8a1357560aa6b2618dfe65674c9c9179940ef88 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Sun, 11 Oct 2015 03:37:50 +0000 Subject: systemd-run: can launch units with SyslogLevel --- src/core/dbus-execute.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/core/dbus-execute.c') diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 88db179958..73290002f6 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -880,6 +880,19 @@ int bus_exec_context_set_transient_property( unit_write_drop_in_private_format(u, mode, name, "SyslogIdentifier=%s\n", id); } + return 1; + } else if (streq(name, "SyslogLevel")) { + int level; + + r = sd_bus_message_read(message, "i", &level); + if (r < 0) + return r; + + if (mode != UNIT_CHECK) { + c->syslog_priority = (c->syslog_priority & LOG_FACMASK) | level; + unit_write_drop_in_private_format(u, mode, name, "SyslogLevel=%i\n", level); + } + return 1; } else if (streq(name, "Nice")) { int n; -- cgit v1.2.3-54-g00ecf From 460ed929cf2081e5a445b9e8fedbbaf0da7eff44 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Sun, 11 Oct 2015 03:55:41 +0000 Subject: systemd-run: can launch units with SyslogFacility --- src/core/dbus-execute.c | 13 +++++++++++++ src/shared/bus-util.c | 11 +++++++++++ 2 files changed, 24 insertions(+) (limited to 'src/core/dbus-execute.c') diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 73290002f6..b87192a9ae 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -893,6 +893,19 @@ int bus_exec_context_set_transient_property( unit_write_drop_in_private_format(u, mode, name, "SyslogLevel=%i\n", level); } + return 1; + } else if (streq(name, "SyslogFacility")) { + int facility; + + r = sd_bus_message_read(message, "i", &facility); + if (r < 0) + return r; + + if (mode != UNIT_CHECK) { + c->syslog_priority = (facility << 3) | LOG_PRI(c->syslog_priority); + unit_write_drop_in_private_format(u, mode, name, "SyslogFacility=%i\n", facility); + } + return 1; } else if (streq(name, "Nice")) { int n; diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index bf9320b0e0..3a45ac4064 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1508,6 +1508,17 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen r = sd_bus_message_append(m, "v", "i", level); + } else if (streq(field, "SyslogFacility")) { + int facility; + + facility = log_facility_unshifted_from_string(eq); + if (facility < 0) { + log_error("Failed to parse %s value %s.", field, eq); + return -EINVAL; + } + + r = sd_bus_message_append(m, "v", "i", facility); + } else if (streq(field, "DeviceAllow")) { if (isempty(eq)) -- cgit v1.2.3-54-g00ecf From e0d6e0fa55054b7eacf58c511abff710fef5712f Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Wed, 14 Oct 2015 16:30:35 +0000 Subject: core: execute: validate syslog level and facility --- src/core/dbus-execute.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/core/dbus-execute.c') diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index b87192a9ae..8b1f830476 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -888,6 +888,9 @@ int bus_exec_context_set_transient_property( if (r < 0) return r; + if (!log_level_is_valid(level)) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Log level value out of range"); + if (mode != UNIT_CHECK) { c->syslog_priority = (c->syslog_priority & LOG_FACMASK) | level; unit_write_drop_in_private_format(u, mode, name, "SyslogLevel=%i\n", level); @@ -901,6 +904,9 @@ int bus_exec_context_set_transient_property( if (r < 0) return r; + if (!log_facility_unshifted_is_valid(facility)) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Log facility value out of range"); + if (mode != UNIT_CHECK) { c->syslog_priority = (facility << 3) | LOG_PRI(c->syslog_priority); unit_write_drop_in_private_format(u, mode, name, "SyslogFacility=%i\n", facility); -- cgit v1.2.3-54-g00ecf