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: remove per-user runtime dir again if setup fails
[elogind.git]
/
src
/
login
/
logind-session.c
diff --git
a/src/login/logind-session.c
b/src/login/logind-session.c
index c4fe53bc6119fcdfa74bc289908643e8645126a5..a51f9f3e0fccd2c040e6c6db9cbf32add41941ed 100644
(file)
--- a/
src/login/logind-session.c
+++ b/
src/login/logind-session.c
@@
-292,7
+292,7
@@
int session_save(Session *s) {
finish:
if (r < 0)
finish:
if (r < 0)
- log_error
("Failed to save session data %s: %s", s->state_file, strerror(-r)
);
+ log_error
_errno(r, "Failed to save session data %s: %m", s->state_file
);
return r;
}
return r;
}
@@
-337,10
+337,8
@@
int session_load(Session *s) {
"CONTROLLER", &controller,
NULL);
"CONTROLLER", &controller,
NULL);
- if (r < 0) {
- log_error("Failed to read %s: %s", s->state_file, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to read %s: %m", s->state_file);
if (!s->user) {
uid_t u;
if (!s->user) {
uid_t u;
@@
-357,7
+355,7
@@
int session_load(Session *s) {
return r;
}
return r;
}
- user = hashmap_get(s->manager->users, U
LONG_TO_PTR((unsigned long)
u));
+ user = hashmap_get(s->manager->users, U
ID_TO_PTR(
u));
if (!user) {
log_error("User of session %s not known.", s->id);
return -ENOENT;
if (!user) {
log_error("User of session %s not known.", s->id);
return -ENOENT;
@@
-969,10
+967,8
@@
static int session_open_vt(Session *s) {
sprintf(path, "/dev/tty%u", s->vtnr);
s->vtfd = open(path, O_RDWR | O_CLOEXEC | O_NONBLOCK | O_NOCTTY);
sprintf(path, "/dev/tty%u", s->vtnr);
s->vtfd = open(path, O_RDWR | O_CLOEXEC | O_NONBLOCK | O_NOCTTY);
- if (s->vtfd < 0) {
- log_error("cannot open VT %s of session %s: %m", path, s->id);
- return -errno;
- }
+ if (s->vtfd < 0)
+ return log_error_errno(errno, "cannot open VT %s of session %s: %m", path, s->id);
return s->vtfd;
}
return s->vtfd;
}
@@
-991,21
+987,21
@@
int session_prepare_vt(Session *s) {
r = fchown(vt, s->user->uid, -1);
if (r < 0) {
r = -errno;
r = fchown(vt, s->user->uid, -1);
if (r < 0) {
r = -errno;
- log_error
(
"Cannot change owner of /dev/tty%u: %m", s->vtnr);
+ log_error
_errno(errno,
"Cannot change owner of /dev/tty%u: %m", s->vtnr);
goto error;
}
r = ioctl(vt, KDSKBMODE, K_OFF);
if (r < 0) {
r = -errno;
goto error;
}
r = ioctl(vt, KDSKBMODE, K_OFF);
if (r < 0) {
r = -errno;
- log_error
(
"Cannot set K_OFF on /dev/tty%u: %m", s->vtnr);
+ log_error
_errno(errno,
"Cannot set K_OFF on /dev/tty%u: %m", s->vtnr);
goto error;
}
r = ioctl(vt, KDSETMODE, KD_GRAPHICS);
if (r < 0) {
r = -errno;
goto error;
}
r = ioctl(vt, KDSETMODE, KD_GRAPHICS);
if (r < 0) {
r = -errno;
- log_error
(
"Cannot set KD_GRAPHICS on /dev/tty%u: %m", s->vtnr);
+ log_error
_errno(errno,
"Cannot set KD_GRAPHICS on /dev/tty%u: %m", s->vtnr);
goto error;
}
goto error;
}
@@
-1018,7
+1014,7
@@
int session_prepare_vt(Session *s) {
r = ioctl(vt, VT_SETMODE, &mode);
if (r < 0) {
r = -errno;
r = ioctl(vt, VT_SETMODE, &mode);
if (r < 0) {
r = -errno;
- log_error
(
"Cannot set VT_PROCESS on /dev/tty%u: %m", s->vtnr);
+ log_error
_errno(errno,
"Cannot set VT_PROCESS on /dev/tty%u: %m", s->vtnr);
goto error;
}
goto error;
}
@@
-1075,7
+1071,7
@@
void session_leave_vt(Session *s) {
session_device_pause_all(s);
r = ioctl(s->vtfd, VT_RELDISP, 1);
if (r < 0)
session_device_pause_all(s);
r = ioctl(s->vtfd, VT_RELDISP, 1);
if (r < 0)
- log_debug
(
"Cannot release VT of session %s: %m", s->id);
+ log_debug
_errno(errno,
"Cannot release VT of session %s: %m", s->id);
}
bool session_is_controller(Session *s, const char *sender) {
}
bool session_is_controller(Session *s, const char *sender) {