chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exec: make sure O_NONBLOCK is off for all sockets passed as STDIN/STDOUT/STDERR
[elogind.git]
/
src
/
automount.c
diff --git
a/src/automount.c
b/src/automount.c
index 9843481a61c231b4783b61d0ac58238c4587974b..b32e0027c1f34152ef4f1956a6ad232081151e9c 100644
(file)
--- a/
src/automount.c
+++ b/
src/automount.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-37,6
+37,7
@@
#include "dbus-automount.h"
#include "bus-errors.h"
#include "special.h"
#include "dbus-automount.h"
#include "bus-errors.h"
#include "special.h"
+#include "label.h"
static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
[AUTOMOUNT_DEAD] = UNIT_INACTIVE,
static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
[AUTOMOUNT_DEAD] = UNIT_INACTIVE,
@@
-444,6
+445,8
@@
int automount_send_ready(Automount *a, int status) {
else
log_debug("Sending success.");
else
log_debug("Sending success.");
+ r = 0;
+
/* Autofs thankfully does not hand out 0 as a token */
while ((token = PTR_TO_UINT(set_steal_first(a->tokens)))) {
int k;
/* Autofs thankfully does not hand out 0 as a token */
while ((token = PTR_TO_UINT(set_steal_first(a->tokens)))) {
int k;
@@
-460,8
+463,6
@@
int automount_send_ready(Automount *a, int status) {
r = k;
}
r = k;
}
- r = 0;
-
fail:
if (ioctl_fd >= 0)
close_nointr_nofail(ioctl_fd);
fail:
if (ioctl_fd >= 0)
close_nointr_nofail(ioctl_fd);
@@
-842,6
+843,7
@@
const UnitVTable automount_vtable = {
.reset_maintenance = automount_reset_maintenance,
.reset_maintenance = automount_reset_maintenance,
+ .bus_interface = "org.freedesktop.systemd1.Automount",
.bus_message_handler = bus_automount_message_handler,
.shutdown = automount_shutdown
.bus_message_handler = bus_automount_message_handler,
.shutdown = automount_shutdown