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 v230: Apply missing upstream fixes and updates (5/8) src/libelogind.
[elogind.git]
/
src
/
libelogind
/
sd-login
/
sd-login.c
diff --git
a/src/libelogind/sd-login/sd-login.c
b/src/libelogind/sd-login/sd-login.c
index a0bd299d8a677aaa7e94cd1467080a6983b7c651..e7f6143d935adfade5305a93737fa13c9f699249 100644
(file)
--- a/
src/libelogind/sd-login/sd-login.c
+++ b/
src/libelogind/sd-login/sd-login.c
@@
-378,7
+378,7
@@
static int file_of_seat(const char *seat, char **_p) {
if (!filename_is_valid(seat))
return -EINVAL;
if (!filename_is_valid(seat))
return -EINVAL;
- p = strappend("/run/systemd/seats/", seat);
+
p = strappend("/run/systemd/seats/", seat);
} else {
_cleanup_free_ char *buf = NULL;
} else {
_cleanup_free_ char *buf = NULL;
@@
-442,10
+442,10
@@
static int uid_get_array(uid_t uid, const char *variable, char ***array) {
r = parse_env_file(p, NEWLINE, variable, &s, NULL);
if (r == -ENOENT || (r >= 0 && isempty(s))) {
r = parse_env_file(p, NEWLINE, variable, &s, NULL);
if (r == -ENOENT || (r >= 0 && isempty(s))) {
-
if (array)
-
*array = NULL;
-
return 0;
-
}
+ if (array)
+ *array = NULL;
+ return 0;
+ }
if (r < 0)
return r;
if (r < 0)
return r;