chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: use stdio_unset_cloexec() function
[elogind.git]
/
src
/
login
/
logind-utmp.c
diff --git
a/src/login/logind-utmp.c
b/src/login/logind-utmp.c
index 1e13ff01de75c460aa0e915c0f8b46848d118a0e..d959a4a45496959922e184da5349180823b39fbd 100644
(file)
--- a/
src/login/logind-utmp.c
+++ b/
src/login/logind-utmp.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-20,20
+18,23
@@
***/
#include <errno.h>
***/
#include <errno.h>
+#include <pwd.h>
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
-#include <pwd.h>
#include "sd-messages.h"
#include "sd-messages.h"
-#include "strv.h"
-#include "special.h"
-#include "unit-name.h"
-#include "audit.h"
-#include "bus-util.h"
-#include "bus-error.h"
+
+#include "alloc-util.h"
+#include "audit-util.h"
#include "bus-common-errors.h"
#include "bus-common-errors.h"
-#include "logind.h"
+#include "bus-error.h"
+#include "bus-util.h"
#include "formats-util.h"
#include "formats-util.h"
+#include "logind.h"
+//#include "special.h"
+#include "strv.h"
+#include "unit-name.h"
+#include "user-util.h"
#include "utmp-wtmp.h"
_const_ static usec_t when_wall(usec_t n, usec_t elapse) {
#include "utmp-wtmp.h"
_const_ static usec_t when_wall(usec_t n, usec_t elapse) {
@@
-64,7
+65,7
@@
bool logind_wall_tty_filter(const char *tty, void *userdata) {
assert(m);
assert(m);
- if (!startswith(tty, "/dev/"))
+ if (!startswith(tty, "/dev/")
|| !m->scheduled_shutdown_tty
)
return true;
return !streq(tty + 5, m->scheduled_shutdown_tty);
return true;
return !streq(tty + 5, m->scheduled_shutdown_tty);
@@
-94,7
+95,7
@@
static int warn_wall(Manager *m, usec_t n) {
return 0;
}
return 0;
}
- utmp_wall(l,
lookup_uid
(m->scheduled_shutdown_uid),
+ utmp_wall(l,
uid_to_name
(m->scheduled_shutdown_uid),
m->scheduled_shutdown_tty, logind_wall_tty_filter, m);
return 1;
m->scheduled_shutdown_tty, logind_wall_tty_filter, m);
return 1;