chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Add remaining updates from upstream (3/3)
[elogind.git]
/
src
/
login
/
logind-utmp.c
diff --git
a/src/login/logind-utmp.c
b/src/login/logind-utmp.c
index faa4fc73394848d2dc59e522590f5b6fb7530cd6..8c2bfb07a19cbfa7405b5b8744310f2a2af4006a 100644
(file)
--- a/
src/login/logind-utmp.c
+++ b/
src/login/logind-utmp.c
@@
-20,20
+20,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) {
@@
-94,7
+97,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;