chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tmpfiles: use an enum instead of plain char for item type
[elogind.git]
/
src
/
logind-dbus.c
diff --git
a/src/logind-dbus.c
b/src/logind-dbus.c
index bc1e49d18fa2cd4450bc2ddfab9a8199981f6672..0550d1bd1cc6b29ebe698c6d3e0a4644ed292d89 100644
(file)
--- a/
src/logind-dbus.c
+++ b/
src/logind-dbus.c
@@
-973,8
+973,11
@@
static DBusHandlerResult manager_message_handler(
} else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "CreateSession")) {
r = bus_manager_create_session(m, message, &reply);
} else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "CreateSession")) {
r = bus_manager_create_session(m, message, &reply);
- if (r == -ENOMEM)
- goto oom;
+
+ /* Don't delay the work on OOM here, since it might be
+ * triggered by a low RLIMIT_NOFILE here (since we
+ * send a dupped fd to the client), and we'd rather
+ * see this fail quickly then be retried later */
if (r < 0)
return bus_send_error_reply(connection, message, &error, r);
if (r < 0)
return bus_send_error_reply(connection, message, &error, r);