chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: fix reference to systemd-user-sessions.service
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index 1b6f1362b3fbfb34dc2dee5731cfb570297fd907..d19d648129c04792f6d6b8ec6892117f38113206 100644
(file)
--- a/
src/login/logind-inhibit.c
+++ b/
src/login/logind-inhibit.c
@@
-45,7
+45,7
@@
Inhibitor* inhibitor_new(Manager *m, const char* id) {
return NULL;
}
return NULL;
}
- i->id =
path_get_file_
name(i->state_file);
+ i->id =
base
name(i->state_file);
if (hashmap_put(m->inhibitors, i->id, i) < 0) {
free(i->state_file);
if (hashmap_put(m->inhibitors, i->id, i) < 0) {
free(i->state_file);
@@
-98,12
+98,12
@@
int inhibitor_save(Inhibitor *i) {
"# This is private data. Do not parse.\n"
"WHAT=%s\n"
"MODE=%s\n"
"# This is private data. Do not parse.\n"
"WHAT=%s\n"
"MODE=%s\n"
- "UID=
%lu
\n"
- "PID=
%lu
\n",
+ "UID=
"UID_FMT"
\n"
+ "PID=
"PID_FMT"
\n",
inhibit_what_to_string(i->what),
inhibit_mode_to_string(i->mode),
inhibit_what_to_string(i->what),
inhibit_mode_to_string(i->mode),
-
(unsigned long)
i->uid,
-
(unsigned long)
i->pid);
+ i->uid,
+ i->pid);
if (i->who) {
_cleanup_free_ char *cc = NULL;
if (i->who) {
_cleanup_free_ char *cc = NULL;
@@
-138,7
+138,7
@@
int inhibitor_save(Inhibitor *i) {
finish:
if (r < 0)
finish:
if (r < 0)
- log_error("Failed to save inhibit data
for %s: %s", i->id
, strerror(-r));
+ log_error("Failed to save inhibit data
%s: %s", i->state_file
, strerror(-r));
return r;
}
return r;
}
@@
-300,7
+300,7
@@
int inhibitor_create_fifo(Inhibitor *i) {
}
if (!i->event_source) {
}
if (!i->event_source) {
- r = sd_event_add_io(i->manager->event,
i->fifo_fd, 0, inhibitor_dispatch_fifo, i, &i->event_source
);
+ r = sd_event_add_io(i->manager->event,
&i->event_source, i->fifo_fd, 0, inhibitor_dispatch_fifo, i
);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-372,7
+372,8
@@
bool manager_is_inhibited(
dual_timestamp *since,
bool ignore_inactive,
bool ignore_uid,
dual_timestamp *since,
bool ignore_inactive,
bool ignore_uid,
- uid_t uid) {
+ uid_t uid,
+ Inhibitor **offending) {
Inhibitor *i;
Iterator j;
Inhibitor *i;
Iterator j;
@@
-400,6
+401,9
@@
bool manager_is_inhibited(
ts = i->since;
inhibited = true;
ts = i->since;
inhibited = true;
+
+ if (offending)
+ *offending = i;
}
if (since)
}
if (since)
@@
-409,7
+413,7
@@
bool manager_is_inhibited(
}
const char *inhibit_what_to_string(InhibitWhat w) {
}
const char *inhibit_what_to_string(InhibitWhat w) {
- static
__thread
char buffer[97];
+ static
thread_local
char buffer[97];
char *p;
if (w < 0 || w >= _INHIBIT_WHAT_MAX)
char *p;
if (w < 0 || w >= _INHIBIT_WHAT_MAX)