mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-28 12:44:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

sd-login,test-login: return -ENODATA from sd_pid_get_unit too

Browse Source 
After all, we might be running on a non-systemd system.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-05-18 22:32:19 -04:00
parent ce737f46cd
commit 171f8f591f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd/sd-login/sd-login.c
View File

@ -66,11 +66,13 @@ _public_ int sd_pid_get_session(pid_t pid, char **session) {
}
_public_ int sd_pid_get_unit(pid_t pid, char **unit) {
int r;
assert_return(pid >= 0, -EINVAL);
assert_return(unit, -EINVAL);
return cg_pid_get_unit(pid, unit);
r = cg_pid_get_unit(pid, unit);
return r == -ENXIO ? -ENODATA : r;
}
_public_ int sd_pid_get_user_unit(pid_t pid, char **unit) {

3
src/libsystemd/sd-login/test-login.c
View File

@ -59,7 +59,8 @@ static void test_login(void) {
uid_t u, u2;
char *t, **seats, **sessions;
assert_se(sd_pid_get_unit(0, &unit) >= 0);
r = sd_pid_get_unit(0, &unit);
assert_se(r >= 0 || r == -ENODATA);
log_info("sd_pid_get_unit(0, …) → \"%s\"", unit);
r = sd_pid_get_user_unit(0, &user_unit);