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: fix a couple of format string mistakes
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index d8d5667dc295c6d64c5fd9241f390693fcddc014..f69ae079df6f0e432dc2a0d4f248974f3eb35e41 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-542,7
+542,7
@@
static int manager_setup_kdbus(Manager *m) {
if (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"))
return 0;
if (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"))
return 0;
- m->kdbus_fd = bus_kernel_create_bus(m->running_as == SYSTEMD_SYSTEM ? "system" : "user", &p);
+ m->kdbus_fd = bus_kernel_create_bus(m->running_as == SYSTEMD_SYSTEM ? "system" : "user",
m->running_as == SYSTEMD_SYSTEM,
&p);
if (m->kdbus_fd < 0) {
log_debug("Failed to set up kdbus: %s", strerror(-m->kdbus_fd));
return m->kdbus_fd;
if (m->kdbus_fd < 0) {
log_debug("Failed to set up kdbus: %s", strerror(-m->kdbus_fd));
return m->kdbus_fd;
@@
-1115,7
+1115,7
@@
int manager_load_unit_prepare(
t = unit_name_to_type(name);
t = unit_name_to_type(name);
- if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid(name,
false
))
+ if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid(name,
TEMPLATE_INVALID
))
return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s is not valid.", name);
ret = manager_get_unit(m, name);
return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s is not valid.", name);
ret = manager_get_unit(m, name);
@@
-2208,8
+2208,10
@@
int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
if (safe_atoi(l + 10, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))
log_debug("Failed to parse notify fd: %s", l + 10);
else {
if (safe_atoi(l + 10, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))
log_debug("Failed to parse notify fd: %s", l + 10);
else {
- if (m->notify_fd >= 0)
+ if (m->notify_fd >= 0) {
+ m->notify_event_source = sd_event_source_unref(m->notify_event_source);
close_nointr_nofail(m->notify_fd);
close_nointr_nofail(m->notify_fd);
+ }
m->notify_fd = fdset_remove(fds, fd);
}
m->notify_fd = fdset_remove(fds, fd);
}