chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machined: ignore spurious error
[elogind.git]
/
src
/
login
/
logind-dbus.c
diff --git
a/src/login/logind-dbus.c
b/src/login/logind-dbus.c
index d225ba1619326a0fee07d810f1ce69a4742c1307..bbb4ae2de66a912168a68bf5c658551f4f95c815 100644
(file)
--- a/
src/login/logind-dbus.c
+++ b/
src/login/logind-dbus.c
@@
-23,7
+23,6
@@
#include <string.h>
#include <unistd.h>
#include <pwd.h>
#include <string.h>
#include <unistd.h>
#include <pwd.h>
-#include <sys/capability.h>
#include "sd-id128.h"
#include "sd-messages.h"
#include "sd-id128.h"
#include "sd-messages.h"
@@
-40,9
+39,10
@@
#include "audit.h"
#include "bus-util.h"
#include "bus-error.h"
#include "audit.h"
#include "bus-util.h"
#include "bus-error.h"
-#include "logind.h"
-#include "bus-errors.h"
+#include "bus-common-errors.h"
#include "udev-util.h"
#include "udev-util.h"
+#include "selinux-util.h"
+#include "logind.h"
static int property_get_idle_hint(
sd_bus *bus,
static int property_get_idle_hint(
sd_bus *bus,
@@
-727,7
+727,7
@@
static int method_create_session(sd_bus *bus, sd_bus_message *message, void *use
/* Now, let's wait until the slice unit and stuff got
* created. We send the reply back from
/* Now, let's wait until the slice unit and stuff got
* created. We send the reply back from
- * session_send_create_reply().*/
+ * session_send_create_reply().
*/
return 1;
return 1;
@@
-1159,7
+1159,7
@@
static int flush_devices(Manager *m) {
d = opendir("/etc/udev/rules.d");
if (!d) {
if (errno != ENOENT)
d = opendir("/etc/udev/rules.d");
if (!d) {
if (errno != ENOENT)
- log_warning
(
"Failed to open /etc/udev/rules.d: %m");
+ log_warning
_errno(errno,
"Failed to open /etc/udev/rules.d: %m");
} else {
struct dirent *de;
} else {
struct dirent *de;
@@
-1175,7
+1175,7
@@
static int flush_devices(Manager *m) {
continue;
if (unlinkat(dirfd(d), de->d_name, 0) < 0)
continue;
if (unlinkat(dirfd(d), de->d_name, 0) < 0)
- log_warning
(
"Failed to unlink %s: %m", de->d_name);
+ log_warning
_errno(errno,
"Failed to unlink %s: %m", de->d_name);
}
}
}
}
@@
-2111,9
+2111,10
@@
int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdat
return 0;
r = unit_name_from_dbus_path(path, &unit);
return 0;
r = unit_name_from_dbus_path(path, &unit);
+ if (r == -EINVAL) /* not a unit */
+ return 0;
if (r < 0)
if (r < 0)
- /* quietly ignore non-units paths */
- return r == -EINVAL ? 0 : r;
+ return r;
session = hashmap_get(m->session_units, unit);
if (session)
session = hashmap_get(m->session_units, unit);
if (session)