chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dhcp: Add function to free DHCP client data
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index 7de0b268112af4a05d02ff3b59b2ccc6f08fe819..ad4c6e8ed91fdce35495d1a8c752f2d601c1d2b2 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-22,9
+22,7
@@
#include <assert.h>
#include <errno.h>
#include <string.h>
#include <assert.h>
#include <errno.h>
#include <string.h>
-#include <sys/epoll.h>
#include <signal.h>
#include <signal.h>
-#include <sys/signalfd.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/poll.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/poll.h>
@@
-414,6
+412,7
@@
static int manager_setup_kdbus(Manager *m) {
assert(m);
assert(m);
+#ifdef ENABLE_KDBUS
if (m->kdbus_fd >= 0)
return 0;
if (m->kdbus_fd >= 0)
return 0;
@@
-427,7
+426,9
@@
static int manager_setup_kdbus(Manager *m) {
return m->kdbus_fd;
}
return m->kdbus_fd;
}
- log_info("Successfully set up kdbus on %s", p);
+ log_debug("Successfully set up kdbus on %s", p);
+#endif
+
return 0;
}
return 0;
}
@@
-1075,7
+1076,7
@@
int manager_load_unit_prepare(
return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Path %s is not absolute.", path);
if (!name)
return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Path %s is not absolute.", path);
if (!name)
- name =
path_get_file_
name(path);
+ name =
base
name(path);
t = unit_name_to_type(name);
t = unit_name_to_type(name);
@@
-2169,7
+2170,7
@@
int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
} else if (startswith(l, "kdbus-fd=")) {
int fd;
} else if (startswith(l, "kdbus-fd=")) {
int fd;
- if (safe_atoi(l + 9, &fd) < 0 || !fdset_contains(fds, fd))
+ if (safe_atoi(l + 9, &fd) < 0 ||
fd < 0 ||
!fdset_contains(fds, fd))
log_debug("Failed to parse kdbus fd: %s", l + 9);
else {
if (m->kdbus_fd >= 0)
log_debug("Failed to parse kdbus fd: %s", l + 9);
else {
if (m->kdbus_fd >= 0)
@@
-2208,10
+2209,8
@@
int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
}
finish:
}
finish:
- if (ferror(f))
{
+ if (ferror(f))
r = -EIO;
r = -EIO;
- goto finish;
- }
assert(m->n_reloading > 0);
m->n_reloading --;
assert(m->n_reloading > 0);
m->n_reloading --;